Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update entity definitions to prevent checks from failing while running docker-compose #45

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −21
Open

Update entity definitions to prevent checks from failing while running docker-compose #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions compose/zmon-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/check-definitions/03-zmon-controller-actuator-metrics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions examples/entities/demo-cloud.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
infrastructure_account: dc:1
application_id: zmon-scheduler
application_version: 1
host: localhost
host: scheduler
proto: http
ports:
"8085": 8085
Expand All @@ -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
Expand All @@ -52,7 +52,7 @@
infrastructure_account: dc:1
application_id: zmon-controller
application_version: 1
host: localhost
host: controller
proto: https
ports:
"8443": 8443
Expand All @@ -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
14 changes: 7 additions & 7 deletions examples/entities/demo-webapps.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions examples/entities/local-postgresql.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

2 changes: 1 addition & 1 deletion examples/entities/redis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
- id: zmon-redis
type: redis
host: localhost
host: redis