misc lab issues sorted

openconfig · Nov 6, 2024 · fdf6057 · fdf6057
1 parent 36634dd
commit fdf6057
Show file tree

Hide file tree

Showing 50 changed files with 127 additions and 70 deletions.
diff --git a/.../deployments/1.single-instance/10.prometheus-with-cache/containerlab/prometheus.clab.yaml b/.../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/...yments/1.single-instance/10.prometheus-with-cache/containerlab/prometheus/prometheus.yaml b/...yments/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
@@ -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/...ples/deployments/1.single-instance/4.prometheus-output/docker-compose/docker-compose.yaml b/...ples/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/...ployments/1.single-instance/4.prometheus-output/docker-compose/prometheus/prometheus.yaml b/...ployments/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
diff --git a/.../deployments/1.single-instance/5.multiple-outputs/containerlab/multiple-outputs.clab.yaml b/.../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/.../deployments/1.single-instance/5.multiple-outputs/containerlab/prometheus/prometheus.yaml b/.../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
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
@@ -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/...eployments/1.single-instance/5.multiple-outputs/docker-compose/prometheus/prometheus.yaml b/...eployments/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
diff --git a/...deployments/1.single-instance/6.prometheus-write-output/containerlab/prom_write.clab.yaml b/...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
@@ -30,15 +30,15 @@ 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
       cmd: "--config /app/gnmic.yaml --log subscribe"
 
     cortex:
       kind: linux
-      image: quay.io/cortexproject/cortex:latest
+      image: quay.io/cortexproject/cortex:v1.18.1
       ports:
         - 9009:9009
       binds:

diff --git a/...yments/1.single-instance/8.victoria-metrics-output/containerlab/victoriametrics.clab.yaml b/...yments/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -15,3 +15,6 @@ scrape_configs:
     scrape_interval: 10s 
     consul_sd_configs:
       - server: clab-lab22-consul-agent:8500
+        services:
+          - prometheus-output1
+          - cluster2-gnmic-api
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
@@ -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/...ples/deployments/2.clusters/2.prometheus-output/docker-compose/prometheus/prometheus.yaml b/...ples/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
@@ -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
@@ -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/...oyments/2.clusters/3.nats-input-prometheus-output/containerlab/prometheus/prometheus.yaml b/...oyments/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
diff --git a/.../deployments/2.clusters/3.nats-input-prometheus-output/docker-compose/docker-compose.yaml b/.../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/...ments/2.clusters/3.nats-input-prometheus-output/docker-compose/prometheus/prometheus.yaml b/...ments/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
@@ -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
@@ -15,3 +15,6 @@ scrape_configs:
     scrape_interval: 10s 
     consul_sd_configs:
       - server: clab-lab24-consul-agent:8500
+        services:
+          - prometheus-output1
+          - cluster2-gnmic-api
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
@@ -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/...s/deployments/2.clusters/5.shared-cache/jetstream/containerlab/prometheus/prometheus.yaml b/...s/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
@@ -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
@@ -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
@@ -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