Merge pull request prometheus#4 from mesosphere/build

Working version
hectorj2f · Mar 6, 2018 · be014c6 · be014c6
2 parents 847ad38 + e6c8501
commit be014c6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -23,9 +23,9 @@ ext {
 }
 
 dependencies {
-    compile "mesosphere:scheduler:0.31.0-SNAPSHOT"
-    compile "mesosphere:executor:0.31.0-SNAPSHOT"
-    testCompile "mesosphere:testing:0.31.0-SNAPSHOT"
+    compile "mesosphere:scheduler:0.40.3"
+    compile "mesosphere:executor:0.40.3"
+    testCompile "mesosphere:testing:0.40.3"
 }
 
 distributions {

diff --git a/options.json b/options.json
@@ -1,5 +1,5 @@
 {
   "service": {
-    "auth-token": ""
+    "sleep": 5
   }
 }
diff --git a/src/main/dist/prometheus.yml b/src/main/dist/prometheus.yml
@@ -29,5 +29,4 @@ scrape_configs:
     scrape_interval: {{SCRAPE_INTERVAL}}s
     scrape_timeout: {{SCRAPE_TIMEOUT}}s
     static_configs:
-    - targets:
-      - dcos-0-exporter.prometheus.mesos:9090
+      - targets: ['10.0.0.12:9273', '10.0.7.75:9273', '10.0.1.114:9273']
diff --git a/universe/marathon.json.mustache b/universe/marathon.json.mustache
@@ -22,6 +22,7 @@
   },
   {{/service.service_account_secret}}
   "env": {
+    "MESOS_API_VERSION": "V1",
     "PACKAGE_NAME": "{{package-name}}",
     "PACKAGE_VERSION": "{{package-version}}",
     "PACKAGE_BUILD_TIME_EPOCH_MS": "{{package-build-time-epoch-ms}}",