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

fixes for examples. #552

Merged
merged 2 commits into from
Nov 7, 2024
Merged

fixes for examples. #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdf6057
misc lab issues sorted
hyposcaler-bot Nov 6, 2024
c6a0047
removed references to priv-gnmic
hyposcaler-bot Nov 7, 2024
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
2 changes: 1 addition & 1 deletion .../deployments/1.single-instance/10.prometheus-with-cache/containerlab/prometheus.clab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions ...yments/1.single-instance/10.prometheus-with-cache/containerlab/prometheus/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/deployments/1.single-instance/4.prometheus-output/containerlab/prometheus.clab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ topology:

consul-agent:
kind: linux
image: consul:latest
image: hashicorp/consul:latest
ports:
- 8500:8500
- 8600:8600/udp
Expand Down
2 changes: 1 addition & 1 deletion ...ples/deployments/1.single-instance/4.prometheus-output/docker-compose/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:
- consul-agent

consul-agent:
image: consul:latest
image: hashicorp/consul:latest
container_name: consul
networks:
- gnmic-net
Expand Down
2 changes: 2 additions & 0 deletions ...ployments/1.single-instance/4.prometheus-output/docker-compose/prometheus/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ scrape_configs:
scrape_interval: 10s
consul_sd_configs:
- server: consul-agent:8500
services:
- prometheus-prom-output
5 changes: 3 additions & 2 deletions .../deployments/1.single-instance/5.multiple-outputs/containerlab/multiple-outputs.clab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -72,7 +73,7 @@ topology:

consul-agent:
kind: linux
image: consul:latest
image: hashicorp/consul:latest
ports:
- 8500:8500
- 8600:8600/udp
Expand Down
2 changes: 2 additions & 0 deletions .../deployments/1.single-instance/5.multiple-outputs/containerlab/prometheus/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ scrape_configs:
scrape_interval: 10s
consul_sd_configs:
- server: clab-lab15-consul-agent:8500
services:
- prometheus-prom-output
2 changes: 1 addition & 1 deletion examples/deployments/1.single-instance/5.multiple-outputs/docker-compose/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:
- consul-agent

consul-agent:
image: consul:latest
image: hashicorp/consul:latest
container_name: consul
networks:
- gnmic-net
Expand Down
2 changes: 2 additions & 0 deletions ...eployments/1.single-instance/5.multiple-outputs/docker-compose/prometheus/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ scrape_configs:
scrape_interval: 10s
consul_sd_configs:
- server: consul-agent:8500
services:
- prometheus-prom-output
2 changes: 1 addition & 1 deletion ...deployments/1.single-instance/6.prometheus-write-output/containerlab/prom_write.clab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ topology:

consul-agent:
kind: linux
image: consul:latest
image: hashicorp/consul:latest
ports:
- 8500:8500
- 8600:8600/udp
Expand Down
4 changes: 2 additions & 2 deletions examples/deployments/1.single-instance/7.cortex-output/containerlab/cortexmetrics.clab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...yments/1.single-instance/8.victoria-metrics-output/containerlab/victoriametrics.clab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/deployments/1.single-instance/9.jetstream-output/containerlab/jetstream.clab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/deployments/2.clusters/1.influxdb-output/containerlab/lab21.clab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ topology:

consul-agent:
kind: linux
image: consul:latest
image: hashicorp/consul:latest
ports:
- 8500:8500
- 8600:8600/udp
Expand Down
2 changes: 1 addition & 1 deletion examples/deployments/2.clusters/1.influxdb-output/docker-compose/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ services:
- 7892:7892

consul-agent:
image: consul:latest
image: hashicorp/consul:latest
container_name: consul
networks:
- gnmic-net
Expand Down
5 changes: 1 addition & 4 deletions examples/deployments/2.clusters/2.prometheus-output/containerlab/lab22.clab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -87,7 +84,7 @@ topology:

consul-agent:
kind: linux
image: consul:latest
image: hashicorp/consul:latest
ports:
- 8500:8500
- 8600:8600/udp
Expand Down
3 changes: 3 additions & 0 deletions examples/deployments/2.clusters/2.prometheus-output/containerlab/prometheus/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ scrape_configs:
scrape_interval: 10s
consul_sd_configs:
- server: clab-lab22-consul-agent:8500
services:
- prometheus-output1
- cluster2-gnmic-api
2 changes: 1 addition & 1 deletion examples/deployments/2.clusters/2.prometheus-output/docker-compose/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ services:
- 9806:9806

consul-agent:
image: consul:latest
image: hashicorp/consul:latest
container_name: consul
networks:
- gnmic-net
Expand Down
3 changes: 3 additions & 0 deletions ...ples/deployments/2.clusters/2.prometheus-output/docker-compose/prometheus/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ scrape_configs:
scrape_interval: 10s
consul_sd_configs:
- server: consul-agent:8500
services:
- prometheus-output1
- cluster2-gnmic-api
3 changes: 3 additions & 0 deletions examples/deployments/2.clusters/3.nats-input-prometheus-output/containerlab/gnmic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ skip-verify: true
encoding: json_ietf
log: true

api-server:
enable-metrics: true

loader:
type: docker
filters:
Expand Down
4 changes: 2 additions & 2 deletions examples/deployments/2.clusters/3.nats-input-prometheus-output/containerlab/lab23.clab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -84,7 +84,7 @@ topology:

consul-agent:
kind: linux
image: consul:latest
image: hashicorp/consul:latest
ports:
- 8500:8500
- 8600:8600/udp
Expand Down
3 changes: 3 additions & 0 deletions ...oyments/2.clusters/3.nats-input-prometheus-output/containerlab/prometheus/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ scrape_configs:
scrape_interval: 10s
consul_sd_configs:
- server: clab-lab23-consul-agent:8500
services:
- prometheus-output1
- cluster2-gnmic-api
2 changes: 1 addition & 1 deletion .../deployments/2.clusters/3.nats-input-prometheus-output/docker-compose/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ services:
- 9806:9806

consul-agent:
image: consul:latest
image: hashicorp/consul:latest
container_name: consul
networks:
- gnmic-net
Expand Down
3 changes: 3 additions & 0 deletions ...ments/2.clusters/3.nats-input-prometheus-output/docker-compose/prometheus/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ scrape_configs:
scrape_interval: 10s
consul_sd_configs:
- server: consul-agent:8500
services:
- prometheus-output1
- cluster2-gnmic-api
2 changes: 1 addition & 1 deletion examples/deployments/2.clusters/4.gnmi-server/containerlab/gnmi-server.clab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ topology:

consul-agent:
kind: linux
image: consul:latest
image: hashicorp/consul:latest
ports:
- 8500:8500
- 8600:8600/udp
Expand Down
3 changes: 3 additions & 0 deletions examples/deployments/2.clusters/4.gnmi-server/containerlab/prometheus/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ scrape_configs:
scrape_interval: 10s
consul_sd_configs:
- server: clab-lab24-consul-agent:8500
services:
- prometheus-output1
- cluster2-gnmic-api
8 changes: 4 additions & 4 deletions examples/deployments/2.clusters/5.shared-cache/jetstream/containerlab/lab25-1.clab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -84,7 +84,7 @@ topology:

consul-agent:
kind: linux
image: consul:latest
image: hashicorp/consul:latest
ports:
- 8500:8500
- 8600:8600/udp
Expand Down
3 changes: 3 additions & 0 deletions ...s/deployments/2.clusters/5.shared-cache/jetstream/containerlab/prometheus/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions examples/deployments/2.clusters/5.shared-cache/nats/containerlab/lab25-2.clab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -84,7 +84,7 @@ topology:

consul-agent:
kind: linux
image: consul:latest
image: hashicorp/consul:latest
ports:
- 8500:8500
- 8600:8600/udp
Expand Down
3 changes: 3 additions & 0 deletions examples/deployments/2.clusters/5.shared-cache/nats/containerlab/prometheus/prometheus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions examples/deployments/2.clusters/5.shared-cache/redis/containerlab/lab25-3.clab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -84,7 +84,7 @@ topology:

consul-agent:
kind: linux
image: consul:latest
image: hashicorp/consul:latest
ports:
- 8500:8500
- 8600:8600/udp
Expand Down
Loading