From 29a2b8120863d293b5b566075d2a2c9dcf0b257c Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Thu, 14 Jan 2021 15:58:13 +0200 Subject: [PATCH 1/2] actually add prometheus dir that we configure to be the config path not sure how this ever worked before --- .../prometheus/prometheus.yml | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 docker/docker-dev-bigtable/prometheus/prometheus.yml diff --git a/docker/docker-dev-bigtable/prometheus/prometheus.yml b/docker/docker-dev-bigtable/prometheus/prometheus.yml new file mode 100644 index 0000000000..ac43bc6253 --- /dev/null +++ b/docker/docker-dev-bigtable/prometheus/prometheus.yml @@ -0,0 +1,34 @@ +global: + scrape_interval: 1s + evaluation_interval: 1s + + # Attach these labels to any time series or alerts when communicating with + # external systems (federation, remote storage, Alertmanager). + external_labels: + monitor: 'docker-host-alpha' + +# Load and evaluate rules in this file every 'evaluation_interval' seconds. +rule_files: + +# A scrape configuration containing exactly one endpoint to scrape. +scrape_configs: + - job_name: 'nodeexporter' + scrape_interval: 1s + static_configs: + - targets: ['nodeexporter:9100'] + + - job_name: 'cadvisor' + scrape_interval: 1s + static_configs: + - targets: ['cadvisor:8080'] + + - job_name: 'prometheus' + scrape_interval: 1s + static_configs: + - targets: ['localhost:9090'] + + - job_name: metrictank + metrics_path: /prometheus/metrics + scrape_interval: 1s + static_configs: + - targets: ['metrictank:6060'] From 341ff4048a2b52bcfd3365e887966f4ea055ba0b Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Thu, 14 Jan 2021 15:59:18 +0200 Subject: [PATCH 2/2] pin cloud sdk version for some reason, more recent versions such as 323.0.0 started erroring: Executing: /usr/lib/google-cloud-sdk/platform/bigtable-emulator/cbtemulator ERROR: gcloud crashed "Operation not permitted" the release notes don't seem to mention a relevant change (https://cloud.google.com/sdk/docs/release-notes#) so let's just pin the version. --- docker/docker-dev-bigtable/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-dev-bigtable/docker-compose.yml b/docker/docker-dev-bigtable/docker-compose.yml index 8edfe3151b..70a5309132 100644 --- a/docker/docker-dev-bigtable/docker-compose.yml +++ b/docker/docker-dev-bigtable/docker-compose.yml @@ -32,7 +32,7 @@ services: bigtable: hostname: bigtable - image: google/cloud-sdk + image: google/cloud-sdk:321.0.0 command: gcloud beta emulators bigtable start --host-port=0.0.0.0:8086 ports: - "8086:8086"