diff --git a/examples/deployments/1.single-instance/10.prometheus-with-cache/containerlab/prometheus.clab.yaml b/examples/deployments/1.single-instance/10.prometheus-with-cache/containerlab/prometheus.clab.yaml index 9932ccfb..f05e9d1e 100644 --- a/examples/deployments/1.single-instance/10.prometheus-with-cache/containerlab/prometheus.clab.yaml +++ b/examples/deployments/1.single-instance/10.prometheus-with-cache/containerlab/prometheus.clab.yaml @@ -29,7 +29,7 @@ topology: gnmic: kind: linux - image: gnmic:0.0.0 + image: ghcr.io/openconfig/gnmic:latest binds: - ./gnmic.yaml:/app/gnmic.yaml:ro - /var/run/docker.sock:/var/run/docker.sock diff --git a/examples/deployments/1.single-instance/10.prometheus-with-cache/containerlab/prometheus/prometheus.yaml b/examples/deployments/1.single-instance/10.prometheus-with-cache/containerlab/prometheus/prometheus.yaml index 150768e7..dbfc67ad 100644 --- a/examples/deployments/1.single-instance/10.prometheus-with-cache/containerlab/prometheus/prometheus.yaml +++ b/examples/deployments/1.single-instance/10.prometheus-with-cache/containerlab/prometheus/prometheus.yaml @@ -15,6 +15,11 @@ scrape_configs: scrape_interval: 10s consul_sd_configs: - server: clab-lab110-consul-agent:8500 + services: + - prometheus-prom-output-js + - prometheus-prom-output-nats + - prometheus-prom-output-oc + - prometheus-prom-output-redis - job_name: 'gnmic-internal' scrape_interval: 10s diff --git a/examples/deployments/1.single-instance/4.prometheus-output/containerlab/prometheus.clab.yaml b/examples/deployments/1.single-instance/4.prometheus-output/containerlab/prometheus.clab.yaml index d805fdb2..3b57a045 100644 --- a/examples/deployments/1.single-instance/4.prometheus-output/containerlab/prometheus.clab.yaml +++ b/examples/deployments/1.single-instance/4.prometheus-output/containerlab/prometheus.clab.yaml @@ -37,7 +37,7 @@ topology: consul-agent: kind: linux - image: consul:latest + image: hashicorp/consul:latest ports: - 8500:8500 - 8600:8600/udp diff --git a/examples/deployments/1.single-instance/4.prometheus-output/docker-compose/docker-compose.yaml b/examples/deployments/1.single-instance/4.prometheus-output/docker-compose/docker-compose.yaml index 7f652af0..1f5cd14b 100644 --- a/examples/deployments/1.single-instance/4.prometheus-output/docker-compose/docker-compose.yaml +++ b/examples/deployments/1.single-instance/4.prometheus-output/docker-compose/docker-compose.yaml @@ -27,7 +27,7 @@ services: - consul-agent consul-agent: - image: consul:latest + image: hashicorp/consul:latest container_name: consul networks: - gnmic-net diff --git a/examples/deployments/1.single-instance/4.prometheus-output/docker-compose/prometheus/prometheus.yaml b/examples/deployments/1.single-instance/4.prometheus-output/docker-compose/prometheus/prometheus.yaml index 66ca6e8b..45f16587 100644 --- a/examples/deployments/1.single-instance/4.prometheus-output/docker-compose/prometheus/prometheus.yaml +++ b/examples/deployments/1.single-instance/4.prometheus-output/docker-compose/prometheus/prometheus.yaml @@ -15,3 +15,5 @@ scrape_configs: scrape_interval: 10s consul_sd_configs: - server: consul-agent:8500 + services: + - prometheus-prom-output \ No newline at end of file diff --git a/examples/deployments/1.single-instance/5.multiple-outputs/containerlab/multiple-outputs.clab.yaml b/examples/deployments/1.single-instance/5.multiple-outputs/containerlab/multiple-outputs.clab.yaml index a799d1fa..05119432 100644 --- a/examples/deployments/1.single-instance/5.multiple-outputs/containerlab/multiple-outputs.clab.yaml +++ b/examples/deployments/1.single-instance/5.multiple-outputs/containerlab/multiple-outputs.clab.yaml @@ -27,7 +27,8 @@ topology: gnmic: kind: linux - image: ghcr.io/openconfig/gnmic:latest + # image: ghcr.io/openconfig/gnmic:latest + image: priv-gnmic binds: - ./gnmic.yaml:/app/gnmic.yaml:ro - /var/run/docker.sock:/var/run/docker.sock @@ -72,7 +73,7 @@ topology: consul-agent: kind: linux - image: consul:latest + image: hashicorp/consul:latest ports: - 8500:8500 - 8600:8600/udp diff --git a/examples/deployments/1.single-instance/5.multiple-outputs/containerlab/prometheus/prometheus.yaml b/examples/deployments/1.single-instance/5.multiple-outputs/containerlab/prometheus/prometheus.yaml index 6c8df775..1983beb7 100644 --- a/examples/deployments/1.single-instance/5.multiple-outputs/containerlab/prometheus/prometheus.yaml +++ b/examples/deployments/1.single-instance/5.multiple-outputs/containerlab/prometheus/prometheus.yaml @@ -15,3 +15,5 @@ scrape_configs: scrape_interval: 10s consul_sd_configs: - server: clab-lab15-consul-agent:8500 + services: + - prometheus-prom-output \ No newline at end of file diff --git a/examples/deployments/1.single-instance/5.multiple-outputs/docker-compose/docker-compose.yaml b/examples/deployments/1.single-instance/5.multiple-outputs/docker-compose/docker-compose.yaml index 11496443..5dedfea2 100644 --- a/examples/deployments/1.single-instance/5.multiple-outputs/docker-compose/docker-compose.yaml +++ b/examples/deployments/1.single-instance/5.multiple-outputs/docker-compose/docker-compose.yaml @@ -27,7 +27,7 @@ services: - consul-agent consul-agent: - image: consul:latest + image: hashicorp/consul:latest container_name: consul networks: - gnmic-net diff --git a/examples/deployments/1.single-instance/5.multiple-outputs/docker-compose/prometheus/prometheus.yaml b/examples/deployments/1.single-instance/5.multiple-outputs/docker-compose/prometheus/prometheus.yaml index 66ca6e8b..45f16587 100644 --- a/examples/deployments/1.single-instance/5.multiple-outputs/docker-compose/prometheus/prometheus.yaml +++ b/examples/deployments/1.single-instance/5.multiple-outputs/docker-compose/prometheus/prometheus.yaml @@ -15,3 +15,5 @@ scrape_configs: scrape_interval: 10s consul_sd_configs: - server: consul-agent:8500 + services: + - prometheus-prom-output \ No newline at end of file diff --git a/examples/deployments/1.single-instance/6.prometheus-write-output/containerlab/prom_write.clab.yaml b/examples/deployments/1.single-instance/6.prometheus-write-output/containerlab/prom_write.clab.yaml index 153746cc..1c74a6f8 100644 --- a/examples/deployments/1.single-instance/6.prometheus-write-output/containerlab/prom_write.clab.yaml +++ b/examples/deployments/1.single-instance/6.prometheus-write-output/containerlab/prom_write.clab.yaml @@ -38,7 +38,7 @@ topology: consul-agent: kind: linux - image: consul:latest + image: hashicorp/consul:latest ports: - 8500:8500 - 8600:8600/udp diff --git a/examples/deployments/1.single-instance/7.cortex-output/containerlab/cortexmetrics.clab.yaml b/examples/deployments/1.single-instance/7.cortex-output/containerlab/cortexmetrics.clab.yaml index c2b55586..37007af8 100644 --- a/examples/deployments/1.single-instance/7.cortex-output/containerlab/cortexmetrics.clab.yaml +++ b/examples/deployments/1.single-instance/7.cortex-output/containerlab/cortexmetrics.clab.yaml @@ -30,7 +30,7 @@ topology: gnmic: kind: linux - image: gnmic:0.0.0 + image: ghcr.io/openconfig/gnmic:latest binds: - ./gnmic.yaml:/app/gnmic.yaml:ro - /var/run/docker.sock:/var/run/docker.sock @@ -38,7 +38,7 @@ topology: cortex: kind: linux - image: quay.io/cortexproject/cortex:latest + image: quay.io/cortexproject/cortex:v1.18.1 ports: - 9009:9009 binds: diff --git a/examples/deployments/1.single-instance/8.victoria-metrics-output/containerlab/victoriametrics.clab.yaml b/examples/deployments/1.single-instance/8.victoria-metrics-output/containerlab/victoriametrics.clab.yaml index 8285452b..8cb59ca7 100644 --- a/examples/deployments/1.single-instance/8.victoria-metrics-output/containerlab/victoriametrics.clab.yaml +++ b/examples/deployments/1.single-instance/8.victoria-metrics-output/containerlab/victoriametrics.clab.yaml @@ -30,7 +30,7 @@ topology: gnmic: kind: linux - image: gnmic:0.0.0 + image: ghcr.io/openconfig/gnmic:latest binds: - ./gnmic.yaml:/app/gnmic.yaml:ro - /var/run/docker.sock:/var/run/docker.sock diff --git a/examples/deployments/1.single-instance/9.jetstream-output/containerlab/jetstream.clab.yaml b/examples/deployments/1.single-instance/9.jetstream-output/containerlab/jetstream.clab.yaml index 240d1cb3..e380e7e9 100644 --- a/examples/deployments/1.single-instance/9.jetstream-output/containerlab/jetstream.clab.yaml +++ b/examples/deployments/1.single-instance/9.jetstream-output/containerlab/jetstream.clab.yaml @@ -26,7 +26,7 @@ topology: gnmic: kind: linux - image: gnmic:0.0.0 + image: ghcr.io/openconfig/gnmic:latest binds: - ./gnmic.yaml:/app/gnmic.yaml:ro - /var/run/docker.sock:/var/run/docker.sock diff --git a/examples/deployments/2.clusters/1.influxdb-output/containerlab/lab21.clab.yaml b/examples/deployments/2.clusters/1.influxdb-output/containerlab/lab21.clab.yaml index 80178ae0..b06c939b 100644 --- a/examples/deployments/2.clusters/1.influxdb-output/containerlab/lab21.clab.yaml +++ b/examples/deployments/2.clusters/1.influxdb-output/containerlab/lab21.clab.yaml @@ -78,7 +78,7 @@ topology: consul-agent: kind: linux - image: consul:latest + image: hashicorp/consul:latest ports: - 8500:8500 - 8600:8600/udp diff --git a/examples/deployments/2.clusters/1.influxdb-output/docker-compose/docker-compose.yaml b/examples/deployments/2.clusters/1.influxdb-output/docker-compose/docker-compose.yaml index ff9e2dd9..f927a0c8 100644 --- a/examples/deployments/2.clusters/1.influxdb-output/docker-compose/docker-compose.yaml +++ b/examples/deployments/2.clusters/1.influxdb-output/docker-compose/docker-compose.yaml @@ -52,7 +52,7 @@ services: - 7892:7892 consul-agent: - image: consul:latest + image: hashicorp/consul:latest container_name: consul networks: - gnmic-net diff --git a/examples/deployments/2.clusters/2.prometheus-output/containerlab/lab22.clab.yaml b/examples/deployments/2.clusters/2.prometheus-output/containerlab/lab22.clab.yaml index 6fcb1f87..bcc35f02 100644 --- a/examples/deployments/2.clusters/2.prometheus-output/containerlab/lab22.clab.yaml +++ b/examples/deployments/2.clusters/2.prometheus-output/containerlab/lab22.clab.yaml @@ -36,7 +36,6 @@ topology: gnmic1: kind: linux - #image: ghcr.io/openconfig/gnmic:latest image: ghcr.io/openconfig/gnmic:latest binds: - ./gnmic.yaml:/app/gnmic.yaml:ro @@ -53,7 +52,6 @@ topology: gnmic2: kind: linux - #image: ghcr.io/openconfig/gnmic:latest image: ghcr.io/openconfig/gnmic:latest binds: - ./gnmic.yaml:/app/gnmic.yaml:ro @@ -70,7 +68,6 @@ topology: gnmic3: kind: linux - #image: ghcr.io/openconfig/gnmic:latest image: ghcr.io/openconfig/gnmic:latest binds: - ./gnmic.yaml:/app/gnmic.yaml:ro @@ -87,7 +84,7 @@ topology: consul-agent: kind: linux - image: consul:latest + image: hashicorp/consul:latest ports: - 8500:8500 - 8600:8600/udp diff --git a/examples/deployments/2.clusters/2.prometheus-output/containerlab/prometheus/prometheus.yaml b/examples/deployments/2.clusters/2.prometheus-output/containerlab/prometheus/prometheus.yaml index d74171c1..e1b82ec2 100644 --- a/examples/deployments/2.clusters/2.prometheus-output/containerlab/prometheus/prometheus.yaml +++ b/examples/deployments/2.clusters/2.prometheus-output/containerlab/prometheus/prometheus.yaml @@ -15,3 +15,6 @@ scrape_configs: scrape_interval: 10s consul_sd_configs: - server: clab-lab22-consul-agent:8500 + services: + - prometheus-output1 + - cluster2-gnmic-api \ No newline at end of file diff --git a/examples/deployments/2.clusters/2.prometheus-output/docker-compose/docker-compose.yaml b/examples/deployments/2.clusters/2.prometheus-output/docker-compose/docker-compose.yaml index 1aee6075..4d7211eb 100644 --- a/examples/deployments/2.clusters/2.prometheus-output/docker-compose/docker-compose.yaml +++ b/examples/deployments/2.clusters/2.prometheus-output/docker-compose/docker-compose.yaml @@ -57,7 +57,7 @@ services: - 9806:9806 consul-agent: - image: consul:latest + image: hashicorp/consul:latest container_name: consul networks: - gnmic-net diff --git a/examples/deployments/2.clusters/2.prometheus-output/docker-compose/prometheus/prometheus.yaml b/examples/deployments/2.clusters/2.prometheus-output/docker-compose/prometheus/prometheus.yaml index 66ca6e8b..dbc5b2e4 100644 --- a/examples/deployments/2.clusters/2.prometheus-output/docker-compose/prometheus/prometheus.yaml +++ b/examples/deployments/2.clusters/2.prometheus-output/docker-compose/prometheus/prometheus.yaml @@ -15,3 +15,6 @@ scrape_configs: scrape_interval: 10s consul_sd_configs: - server: consul-agent:8500 + services: + - prometheus-output1 + - cluster2-gnmic-api diff --git a/examples/deployments/2.clusters/3.nats-input-prometheus-output/containerlab/gnmic.yaml b/examples/deployments/2.clusters/3.nats-input-prometheus-output/containerlab/gnmic.yaml index 1af97718..832cf273 100644 --- a/examples/deployments/2.clusters/3.nats-input-prometheus-output/containerlab/gnmic.yaml +++ b/examples/deployments/2.clusters/3.nats-input-prometheus-output/containerlab/gnmic.yaml @@ -12,6 +12,9 @@ skip-verify: true encoding: json_ietf log: true +api-server: + enable-metrics: true + loader: type: docker filters: diff --git a/examples/deployments/2.clusters/3.nats-input-prometheus-output/containerlab/lab23.clab.yaml b/examples/deployments/2.clusters/3.nats-input-prometheus-output/containerlab/lab23.clab.yaml index f27a1363..b668bb1b 100644 --- a/examples/deployments/2.clusters/3.nats-input-prometheus-output/containerlab/lab23.clab.yaml +++ b/examples/deployments/2.clusters/3.nats-input-prometheus-output/containerlab/lab23.clab.yaml @@ -47,7 +47,7 @@ topology: GNMIC_API: :7890 GNMIC_CLUSTERING_INSTANCE_NAME: clab-lab23-gnmic1 GNMIC_CLUSTERING_SERVICE_ADDRESS: clab-lab23-gnmic1 - GNMIC_OUTPUTS_OUTPUT1_LISTEN: clab-glab23-gnmic1:9804 + GNMIC_OUTPUTS_OUTPUT1_LISTEN: clab-lab23-gnmic1:9804 cmd: '--config /app/gnmic-config.yaml subscribe' gnmic2: @@ -84,7 +84,7 @@ topology: consul-agent: kind: linux - image: consul:latest + image: hashicorp/consul:latest ports: - 8500:8500 - 8600:8600/udp diff --git a/examples/deployments/2.clusters/3.nats-input-prometheus-output/containerlab/prometheus/prometheus.yaml b/examples/deployments/2.clusters/3.nats-input-prometheus-output/containerlab/prometheus/prometheus.yaml index 92d53586..cab61171 100644 --- a/examples/deployments/2.clusters/3.nats-input-prometheus-output/containerlab/prometheus/prometheus.yaml +++ b/examples/deployments/2.clusters/3.nats-input-prometheus-output/containerlab/prometheus/prometheus.yaml @@ -15,3 +15,6 @@ scrape_configs: scrape_interval: 10s consul_sd_configs: - server: clab-lab23-consul-agent:8500 + services: + - prometheus-output1 + - cluster2-gnmic-api \ No newline at end of file diff --git a/examples/deployments/2.clusters/3.nats-input-prometheus-output/docker-compose/docker-compose.yaml b/examples/deployments/2.clusters/3.nats-input-prometheus-output/docker-compose/docker-compose.yaml index 2e3d49aa..3c7b9fc7 100644 --- a/examples/deployments/2.clusters/3.nats-input-prometheus-output/docker-compose/docker-compose.yaml +++ b/examples/deployments/2.clusters/3.nats-input-prometheus-output/docker-compose/docker-compose.yaml @@ -58,7 +58,7 @@ services: - 9806:9806 consul-agent: - image: consul:latest + image: hashicorp/consul:latest container_name: consul networks: - gnmic-net diff --git a/examples/deployments/2.clusters/3.nats-input-prometheus-output/docker-compose/prometheus/prometheus.yaml b/examples/deployments/2.clusters/3.nats-input-prometheus-output/docker-compose/prometheus/prometheus.yaml index 66ca6e8b..dbc5b2e4 100644 --- a/examples/deployments/2.clusters/3.nats-input-prometheus-output/docker-compose/prometheus/prometheus.yaml +++ b/examples/deployments/2.clusters/3.nats-input-prometheus-output/docker-compose/prometheus/prometheus.yaml @@ -15,3 +15,6 @@ scrape_configs: scrape_interval: 10s consul_sd_configs: - server: consul-agent:8500 + services: + - prometheus-output1 + - cluster2-gnmic-api diff --git a/examples/deployments/2.clusters/4.gnmi-server/containerlab/gnmi-server.clab.yaml b/examples/deployments/2.clusters/4.gnmi-server/containerlab/gnmi-server.clab.yaml index 53ec5898..223683de 100644 --- a/examples/deployments/2.clusters/4.gnmi-server/containerlab/gnmi-server.clab.yaml +++ b/examples/deployments/2.clusters/4.gnmi-server/containerlab/gnmi-server.clab.yaml @@ -97,7 +97,7 @@ topology: consul-agent: kind: linux - image: consul:latest + image: hashicorp/consul:latest ports: - 8500:8500 - 8600:8600/udp diff --git a/examples/deployments/2.clusters/4.gnmi-server/containerlab/prometheus/prometheus.yaml b/examples/deployments/2.clusters/4.gnmi-server/containerlab/prometheus/prometheus.yaml index 6ab0fd40..a132061d 100644 --- a/examples/deployments/2.clusters/4.gnmi-server/containerlab/prometheus/prometheus.yaml +++ b/examples/deployments/2.clusters/4.gnmi-server/containerlab/prometheus/prometheus.yaml @@ -15,3 +15,6 @@ scrape_configs: scrape_interval: 10s consul_sd_configs: - server: clab-lab24-consul-agent:8500 + services: + - prometheus-output1 + - cluster2-gnmic-api \ No newline at end of file diff --git a/examples/deployments/2.clusters/5.shared-cache/jetstream/containerlab/lab25-1.clab.yaml b/examples/deployments/2.clusters/5.shared-cache/jetstream/containerlab/lab25-1.clab.yaml index 0e226c13..bee49fa0 100644 --- a/examples/deployments/2.clusters/5.shared-cache/jetstream/containerlab/lab25-1.clab.yaml +++ b/examples/deployments/2.clusters/5.shared-cache/jetstream/containerlab/lab25-1.clab.yaml @@ -36,7 +36,7 @@ topology: gnmic1: kind: linux - image: gnmic:0.0.0 + image: ghcr.io/openconfig/gnmic:latest binds: - ./gnmic.yaml:/app/gnmic.yaml:ro - /var/run/docker.sock:/var/run/docker.sock @@ -52,7 +52,7 @@ topology: gnmic2: kind: linux - image: gnmic:0.0.0 + image: ghcr.io/openconfig/gnmic:latest binds: - ./gnmic.yaml:/app/gnmic.yaml:ro - /var/run/docker.sock:/var/run/docker.sock @@ -68,7 +68,7 @@ topology: gnmic3: kind: linux - image: gnmic:0.0.0 + image: ghcr.io/openconfig/gnmic:latest binds: - ./gnmic.yaml:/app/gnmic.yaml:ro - /var/run/docker.sock:/var/run/docker.sock @@ -84,7 +84,7 @@ topology: consul-agent: kind: linux - image: consul:latest + image: hashicorp/consul:latest ports: - 8500:8500 - 8600:8600/udp diff --git a/examples/deployments/2.clusters/5.shared-cache/jetstream/containerlab/prometheus/prometheus.yaml b/examples/deployments/2.clusters/5.shared-cache/jetstream/containerlab/prometheus/prometheus.yaml index 92e310ae..b896e1b5 100644 --- a/examples/deployments/2.clusters/5.shared-cache/jetstream/containerlab/prometheus/prometheus.yaml +++ b/examples/deployments/2.clusters/5.shared-cache/jetstream/containerlab/prometheus/prometheus.yaml @@ -15,3 +15,6 @@ scrape_configs: scrape_interval: 10s consul_sd_configs: - server: clab-lab25-1-consul-agent:8500 + services: + - cluster2-gnmic-api + - prometheus-output1 diff --git a/examples/deployments/2.clusters/5.shared-cache/nats/containerlab/lab25-2.clab.yaml b/examples/deployments/2.clusters/5.shared-cache/nats/containerlab/lab25-2.clab.yaml index 65d55cc6..55feec3b 100644 --- a/examples/deployments/2.clusters/5.shared-cache/nats/containerlab/lab25-2.clab.yaml +++ b/examples/deployments/2.clusters/5.shared-cache/nats/containerlab/lab25-2.clab.yaml @@ -36,7 +36,7 @@ topology: gnmic1: kind: linux - image: gnmic:0.0.0 + image: ghcr.io/openconfig/gnmic:latest binds: - ./gnmic.yaml:/app/gnmic.yaml:ro - /var/run/docker.sock:/var/run/docker.sock @@ -52,7 +52,7 @@ topology: gnmic2: kind: linux - image: gnmic:0.0.0 + image: ghcr.io/openconfig/gnmic:latest binds: - ./gnmic.yaml:/app/gnmic.yaml:ro - /var/run/docker.sock:/var/run/docker.sock @@ -68,7 +68,7 @@ topology: gnmic3: kind: linux - image: gnmic:0.0.0 + image: ghcr.io/openconfig/gnmic:latest binds: - ./gnmic.yaml:/app/gnmic.yaml:ro - /var/run/docker.sock:/var/run/docker.sock @@ -84,7 +84,7 @@ topology: consul-agent: kind: linux - image: consul:latest + image: hashicorp/consul:latest ports: - 8500:8500 - 8600:8600/udp diff --git a/examples/deployments/2.clusters/5.shared-cache/nats/containerlab/prometheus/prometheus.yaml b/examples/deployments/2.clusters/5.shared-cache/nats/containerlab/prometheus/prometheus.yaml index ccb3f1fb..444ba409 100644 --- a/examples/deployments/2.clusters/5.shared-cache/nats/containerlab/prometheus/prometheus.yaml +++ b/examples/deployments/2.clusters/5.shared-cache/nats/containerlab/prometheus/prometheus.yaml @@ -15,3 +15,6 @@ scrape_configs: scrape_interval: 10s consul_sd_configs: - server: clab-lab25-2-consul-agent:8500 + services: + - cluster2-gnmic-api + - prometheus-output1 diff --git a/examples/deployments/2.clusters/5.shared-cache/redis/containerlab/lab25-3.clab.yaml b/examples/deployments/2.clusters/5.shared-cache/redis/containerlab/lab25-3.clab.yaml index 90d97c62..4924086c 100644 --- a/examples/deployments/2.clusters/5.shared-cache/redis/containerlab/lab25-3.clab.yaml +++ b/examples/deployments/2.clusters/5.shared-cache/redis/containerlab/lab25-3.clab.yaml @@ -36,7 +36,7 @@ topology: gnmic1: kind: linux - image: gnmic:0.0.0 + image: ghcr.io/openconfig/gnmic:latest binds: - ./gnmic.yaml:/app/gnmic.yaml:ro - /var/run/docker.sock:/var/run/docker.sock @@ -52,7 +52,7 @@ topology: gnmic2: kind: linux - image: gnmic:0.0.0 + image: ghcr.io/openconfig/gnmic:latest binds: - ./gnmic.yaml:/app/gnmic.yaml:ro - /var/run/docker.sock:/var/run/docker.sock @@ -68,7 +68,7 @@ topology: gnmic3: kind: linux - image: gnmic:0.0.0 + image: ghcr.io/openconfig/gnmic:latest binds: - ./gnmic.yaml:/app/gnmic.yaml:ro - /var/run/docker.sock:/var/run/docker.sock @@ -84,7 +84,7 @@ topology: consul-agent: kind: linux - image: consul:latest + image: hashicorp/consul:latest ports: - 8500:8500 - 8600:8600/udp diff --git a/examples/deployments/2.clusters/5.shared-cache/redis/containerlab/prometheus/prometheus.yaml b/examples/deployments/2.clusters/5.shared-cache/redis/containerlab/prometheus/prometheus.yaml index 2a5248d9..37890528 100644 --- a/examples/deployments/2.clusters/5.shared-cache/redis/containerlab/prometheus/prometheus.yaml +++ b/examples/deployments/2.clusters/5.shared-cache/redis/containerlab/prometheus/prometheus.yaml @@ -15,3 +15,6 @@ scrape_configs: scrape_interval: 10s consul_sd_configs: - server: clab-lab25-3-consul-agent:8500 + services: + - cluster2-gnmic-api + - prometheus-output1 \ No newline at end of file diff --git a/examples/deployments/3.pipelines/1.gnmic-nats-gnmic-prometheus/containerlab/lab31.clab.yaml b/examples/deployments/3.pipelines/1.gnmic-nats-gnmic-prometheus/containerlab/lab31.clab.yaml index 9486ce34..32daba53 100644 --- a/examples/deployments/3.pipelines/1.gnmic-nats-gnmic-prometheus/containerlab/lab31.clab.yaml +++ b/examples/deployments/3.pipelines/1.gnmic-nats-gnmic-prometheus/containerlab/lab31.clab.yaml @@ -40,7 +40,7 @@ topology: consul-agent: kind: linux - image: consul:latest + image: hashicorp/consul:latest ports: - 8500:8500 - 8600:8600/udp diff --git a/examples/deployments/3.pipelines/1.gnmic-nats-gnmic-prometheus/docker-compose/docker-compose.yaml b/examples/deployments/3.pipelines/1.gnmic-nats-gnmic-prometheus/docker-compose/docker-compose.yaml index 5b43e21f..07b8a779 100644 --- a/examples/deployments/3.pipelines/1.gnmic-nats-gnmic-prometheus/docker-compose/docker-compose.yaml +++ b/examples/deployments/3.pipelines/1.gnmic-nats-gnmic-prometheus/docker-compose/docker-compose.yaml @@ -36,7 +36,7 @@ services: - consul-agent consul-agent: - image: consul:latest + image: hashicorp/consul:latest container_name: consul networks: - gnmic-net diff --git a/examples/deployments/3.pipelines/2.gnmic-nats-gnmic-influxdb/containerlab/grafana/datasources/datasource.yaml b/examples/deployments/3.pipelines/2.gnmic-nats-gnmic-influxdb/containerlab/grafana/datasources/datasource.yaml index 575edc9d..1084a38c 100644 --- a/examples/deployments/3.pipelines/2.gnmic-nats-gnmic-influxdb/containerlab/grafana/datasources/datasource.yaml +++ b/examples/deployments/3.pipelines/2.gnmic-nats-gnmic-influxdb/containerlab/grafana/datasources/datasource.yaml @@ -9,21 +9,15 @@ apiVersion: 1 deleteDatasources: - - name: Prometheus + - name: InfluxDB orgId: 1 datasources: - - name: Prometheus - type: prometheus + - name: InfluxDB + type: influxdb orgId: 1 - url: http://clab-lab31-prometheus:9090 - password: - user: - database: - basicAuth: false - basicAuthUser: - basicAuthPassword: - withCredentials: - isDefault: true - version: 1 + url: http://clab-lab32-influxdb:8086 + user: gnmic + password: gnmic + database: telemetry editable: true \ No newline at end of file diff --git a/examples/deployments/3.pipelines/2.gnmic-nats-gnmic-influxdb/containerlab/lab32.clab.yaml b/examples/deployments/3.pipelines/2.gnmic-nats-gnmic-influxdb/containerlab/lab32.clab.yaml index a8a2b9d9..ee85bf21 100644 --- a/examples/deployments/3.pipelines/2.gnmic-nats-gnmic-influxdb/containerlab/lab32.clab.yaml +++ b/examples/deployments/3.pipelines/2.gnmic-nats-gnmic-influxdb/containerlab/lab32.clab.yaml @@ -41,7 +41,7 @@ topology: consul-agent: kind: linux - image: consul:latest + image: hashicorp/consul:latest ports: - 8500:8500 - 8600:8600/udp diff --git a/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/containerlab/gnmic-relay.yaml b/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/containerlab/gnmic-relay.yaml index 90902ea9..12b12925 100644 --- a/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/containerlab/gnmic-relay.yaml +++ b/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/containerlab/gnmic-relay.yaml @@ -10,7 +10,7 @@ log: true inputs: nats-input: - type: input + type: nats address: clab-lab33a-nats:4222 subject: telemetry outputs: diff --git a/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/containerlab/gnmic.yaml b/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/containerlab/gnmic.yaml index d02b1797..83ce6fd7 100644 --- a/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/containerlab/gnmic.yaml +++ b/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/containerlab/gnmic.yaml @@ -12,6 +12,9 @@ skip-verify: true encoding: json_ietf log: true +api-server: + enable-metrics: true + loader: type: docker filters: diff --git a/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/containerlab/lab33a.clab.yaml b/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/containerlab/lab33a.clab.yaml index ec25e6d2..f3af1f7a 100644 --- a/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/containerlab/lab33a.clab.yaml +++ b/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/containerlab/lab33a.clab.yaml @@ -67,16 +67,15 @@ topology: kind: linux image: ghcr.io/openconfig/gnmic:latest binds: - - ./gnmic.yaml:/app/gnmic-config.yaml:ro + - ./gnmic-relay.yaml:/app/gnmic-config.yaml:ro - /var/run/docker.sock:/var/run/docker.sock ports: - - 7892:7892 - 9804:9804 cmd: '--config /app/gnmic-config.yaml subscribe' consul-agent: kind: linux - image: consul:latest + image: hashicorp/consul:latest ports: - 8500:8500 - 8600:8600/udp diff --git a/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/containerlab/prometheus/prometheus.yaml b/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/containerlab/prometheus/prometheus.yaml index b1870330..0c39fd27 100644 --- a/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/containerlab/prometheus/prometheus.yaml +++ b/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/containerlab/prometheus/prometheus.yaml @@ -15,3 +15,6 @@ scrape_configs: scrape_interval: 10s consul_sd_configs: - server: clab-lab33a-consul-agent:8500 + services: + - prometheus-prom-output + - cluster2-gnmic-api diff --git a/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/docker-compose/docker-compose.yaml b/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/docker-compose/docker-compose.yaml index b198243a..9ae57aed 100644 --- a/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/docker-compose/docker-compose.yaml +++ b/examples/deployments/3.pipelines/3a.gnmic-cluster-nats-gnmic-prometheus/docker-compose/docker-compose.yaml @@ -63,7 +63,7 @@ services: - consul-agent consul-agent: - image: consul:latest + image: hashicorp/consul:latest container_name: consul networks: - gnmic-net diff --git a/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/containerlab/gnmic-relay.yaml b/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/containerlab/gnmic-relay.yaml index e100e718..05c85cb4 100644 --- a/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/containerlab/gnmic-relay.yaml +++ b/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/containerlab/gnmic-relay.yaml @@ -10,7 +10,7 @@ log: true inputs: nats-input: - type: input + type: nats address: clab-lab33b-nats:4222 subject: telemetry outputs: diff --git a/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/containerlab/gnmic.yaml b/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/containerlab/gnmic.yaml index 1f972002..8a7681ce 100644 --- a/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/containerlab/gnmic.yaml +++ b/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/containerlab/gnmic.yaml @@ -12,6 +12,9 @@ skip-verify: true encoding: json_ietf log: true +api-server: + enable-metrics: true + loader: type: docker filters: diff --git a/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/containerlab/lab33b.clab.yaml b/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/containerlab/lab33b.clab.yaml index 4500d4a2..de88dc22 100644 --- a/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/containerlab/lab33b.clab.yaml +++ b/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/containerlab/lab33b.clab.yaml @@ -67,16 +67,15 @@ topology: kind: linux image: ghcr.io/openconfig/gnmic:latest binds: - - ./gnmic.yaml:/app/gnmic-config.yaml:ro + - ./gnmic-relay.yaml:/app/gnmic-config.yaml:ro - /var/run/docker.sock:/var/run/docker.sock ports: - - 7892:7892 - 9804:9804 cmd: '--config /app/gnmic-config.yaml subscribe' consul-agent: kind: linux - image: consul:latest + image: hashicorp/consul:latest ports: - 8500:8500 - 8600:8600/udp diff --git a/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/containerlab/prometheus/prometheus.yaml b/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/containerlab/prometheus/prometheus.yaml index b1870330..48a9b05c 100644 --- a/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/containerlab/prometheus/prometheus.yaml +++ b/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/containerlab/prometheus/prometheus.yaml @@ -14,4 +14,9 @@ scrape_configs: - job_name: 'gnmic' scrape_interval: 10s consul_sd_configs: - - server: clab-lab33a-consul-agent:8500 + - server: clab-lab33b-consul-agent:8500 + services: + - prometheus-prom-output + - cluster2-gnmic-api + + diff --git a/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/docker-compose/docker-compose.yaml b/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/docker-compose/docker-compose.yaml index 118dedf6..40c8ca20 100644 --- a/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/docker-compose/docker-compose.yaml +++ b/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/docker-compose/docker-compose.yaml @@ -88,7 +88,7 @@ services: - consul-agent consul-agent: - image: consul:latest + image: hashicorp/consul:latest container_name: consul networks: - gnmic-net diff --git a/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/docker-compose/gnmic-collector.yaml b/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/docker-compose/gnmic-collector.yaml index a60c49e4..2a0cc32e 100644 --- a/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/docker-compose/gnmic-collector.yaml +++ b/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/docker-compose/gnmic-collector.yaml @@ -12,6 +12,9 @@ insecure: true encoding: json_ietf log: true +api-server: + enable-metrics: true + # clustering config clustering: cluster-name: cluster1 diff --git a/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/docker-compose/gnmic-relay.yaml b/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/docker-compose/gnmic-relay.yaml index 9b404e0e..247c1188 100644 --- a/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/docker-compose/gnmic-relay.yaml +++ b/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/docker-compose/gnmic-relay.yaml @@ -10,7 +10,7 @@ log: true inputs: nats-input: - type: input + type: nats address: nats:4222 subject: telemetry outputs: diff --git a/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/docker-compose/prometheus/prometheus.yaml b/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/docker-compose/prometheus/prometheus.yaml index 66ca6e8b..ea46525d 100644 --- a/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/docker-compose/prometheus/prometheus.yaml +++ b/examples/deployments/3.pipelines/3b.gnmic-cluster-nats-gnmic-cluster-prometheus/docker-compose/prometheus/prometheus.yaml @@ -15,3 +15,7 @@ scrape_configs: scrape_interval: 10s consul_sd_configs: - server: consul-agent:8500 + services: + - prometheus-prom-output + - cluster2-gnmic-api + diff --git a/examples/deployments/3.pipelines/4.gnmic-nats-gnmic-prometheus-gnmic-influxdb/docker-compose/docker-compose.yaml b/examples/deployments/3.pipelines/4.gnmic-nats-gnmic-prometheus-gnmic-influxdb/docker-compose/docker-compose.yaml index c4ee532d..60ce983f 100644 --- a/examples/deployments/3.pipelines/4.gnmic-nats-gnmic-prometheus-gnmic-influxdb/docker-compose/docker-compose.yaml +++ b/examples/deployments/3.pipelines/4.gnmic-nats-gnmic-prometheus-gnmic-influxdb/docker-compose/docker-compose.yaml @@ -45,7 +45,7 @@ services: - influxdb consul-agent: - image: consul:latest + image: hashicorp/consul:latest container_name: consul networks: - gnmic-net