zalandoGH-44: Fix the entities for docker-compose. Upgrade versions o…

…f components
avb1989 · Sep 24, 2018 · 69999b8 · 69999b8
1 parent a729c9b
commit 69999b8
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 21 deletions.
diff --git a/compose/zmon-compose.yaml b/compose/zmon-compose.yaml
@@ -32,11 +32,11 @@ services:
             retries: 99
             timeout: 15s
     redis:
-        image: registry.opensource.zalan.do/zmon/redis:3.2.9
+        image: registry.opensource.zalan.do/zmon/redis:3.2.11
         ports:
          - "38086:6379"
     kairosdb:
-        image: registry.opensource.zalan.do/zmon/kairosdb:v1.1.1-294-g9c4346b
+        image: registry.opensource.zalan.do/zmon/kairosdb:5ace4ba
         environment:
             KAIROSDB_JETTY_PORT: 8083
             KAIROSDB_DATASTORE_CASSANDRA_HOST_LIST: cassandra
@@ -56,7 +56,7 @@ services:
         depends_on:
             - "postgresql"
     controller:
-        image: registry.opensource.zalan.do/zmon/zmon-controller:v1.1-293-gdfc7f82
+        image: registry.opensource.zalan.do/zmon/zmon-controller:v347-68-g5f1f80b
         environment:
           MEM_JAVA_PERCENT: 25
           MANAGEMENT_PORT: 7979
@@ -86,8 +86,9 @@ services:
         depends_on:
             - "redis"
             - "postgresql"
+            - "kairosdb"
     scheduler:
-        image: registry.opensource.zalan.do/zmon/zmon-scheduler:v45
+        image: registry.opensource.zalan.do/zmon/zmon-scheduler:v46
         environment:
           MEM_JAVA_PERCENT: 20
           JAVA_OPTS: "-Djavax.net.ssl.trustStorePassword=mypassword -Djavax.net.ssl.trustStore=/resources/host-controller.jks"
@@ -98,8 +99,12 @@ services:
           SCHEDULER_REDIS_HOST: redis
         volumes:
             - "./resources:/resources"
+    metric-cache:
+        image: registry.opensource.zalan.do/zmon/zmon-metric-cache:bbe255b
+        ports:
+         - "8086:8086"
     worker:
-        image: registry.opensource.zalan.do/zmon/zmon-worker:v190
+        image: registry.opensource.zalan.do/zmon/zmon-worker:v200
         environment:
           WORKER_REDIS_SERVERS: redis:6379
           WORKER_KAIROSDB_HOST: kairosdb

diff --git a/examples/check-definitions/03-zmon-controller-actuator-metrics.yaml b/examples/check-definitions/03-zmon-controller-actuator-metrics.yaml
@@ -3,7 +3,7 @@ owning_team: ZMON
 description: |-
   Get Spring Boot Actuator metrics from local ZMON Controller.
 command: |-
-  http('https://localhost:7979/metrics', verify=False, timeout=2).actuator_metrics()
+  http('https://controller:7979/metrics', verify=False, timeout=2).actuator_metrics()
 interval: 15
 entities:
 - type: GLOBAL

diff --git a/examples/entities/demo-cloud.yaml b/examples/entities/demo-cloud.yaml
@@ -32,7 +32,7 @@
   infrastructure_account: dc:1
   application_id: zmon-scheduler
   application_version: 1
-  host: localhost
+  host: scheduler
   proto: http
   ports:
       "8085": 8085
@@ -42,7 +42,7 @@
   infrastructure_account: dc:1
   application_id: zmon-metric-cache
   application_version: 1
-  host: localhost
+  host: metric-cache 
   proto: http
   ports:
       "8086" : 8086
@@ -52,7 +52,7 @@
   infrastructure_account: dc:1
   application_id: zmon-controller
   application_version: 1
-  host: localhost
+  host: controller
   proto: https
   ports:
       "8443": 8443
@@ -63,7 +63,7 @@
   infrastructure_account: dc:1
   application_id: zmon-eventlog-service
   application_version: 1
-  host: localhost
+  host: eventlog
   proto: http
   ports:
       "8081": 8081
diff --git a/examples/entities/demo-webapps.yaml b/examples/entities/demo-webapps.yaml
@@ -1,18 +1,18 @@
 - id: zmon-kairosdb
-  url: http://localhost:8083
+  url: http://kairosdb:8083
   type: demowebapp
 - id: zmon-eventlog-service
-  url: http://localhost:8081
+  url: http://eventlog:8081
   type: demowebapp
-  management_url: http://localhost:8081
+  management_url: http://eventlog:8081
 - id: zmon-scheduler
-  url: http://localhost:8085
+  url: http://scheduler:8085
   type: demowebapp
-  management_url: http://localhost:8085
+  management_url: http://scheduler:8085
 - id: zmon-controller
-  url: https://localhost:8443
+  url: https://controller:8443
   type: demowebapp
-  management_url: https://localhost:7979
+  management_url: https://controller:7979
 - id: zmon-worker
   url: http://localhost:8080
   type: demowebapp
diff --git a/examples/entities/local-postgresql.yaml b/examples/entities/local-postgresql.yaml
@@ -1,7 +1,7 @@
-id: "localhost:5432"
+id: "postgresql:5432"
 type: postgres
-host: localhost
+host: postgresql
 port: 5432
 shards:
-  local_zmon_db: "localhost:5432/local_zmon_db"
+  local_zmon_db: "postgresql:5432/local_zmon_db"
 
diff --git a/examples/entities/redis.yaml b/examples/entities/redis.yaml
@@ -1,3 +1,3 @@
 - id: zmon-redis
   type: redis
-  host: localhost
+  host: redis