Merge pull request #4242 from nvollmar/T6953
637e4cef5ba2
Actions

Description

Merge pull request #4242 from nvollmar/T6953

T6953: merges node and frr exporter under prometheus section

Details

Provenance

c-po	Authored on Dec 20 2024, 10:02 PM
GitHub	Committed on Dec 20 2024, 10:02 PM

Parents

rVYOSONEX5a44b71015e0: T6953: simplify config handling
rVYOSONEXff13d4d288e0: Merge pull request #4244 from indrajitr/ddclient-smoketest-20241219

Branches

Tags

Event Timeline

GitHub <noreply@github.com> committed rVYOSONEX637e4cef5ba2: Merge pull request #4242 from nvollmar/T6953 (authored by c-po).Dec 20 2024, 10:02 PM

Merged Changes

5a44b71015e0 T6953: simplify config handling
Author
nvollmar
Browse Repository
No Builds
No Audits
8092236acc13 T6953: add migration for old configuration
Author
nvollmar
Browse Repository
No Builds
No Audits
7b6f895146bf T6953: merges node and frr exporter under prometheus section
Author
nvollmar
Browse Repository
No Builds
No Audits

Changes (19)

Path

Size

data/

templates/

frr_exporter

frr_exporter.service.j2

node_exporter

node_exporter.service.j2

prometheus

	prometheus/
	frr_exporter/

frr_exporter.service.j2

	prometheus/
	node_exporter/

node_exporter.service.j2

debian/

control

interface-definitions/

include/

version/

monitoring-version.xml.i

service_monitoring_frr_exporter.xml.in

service_monitoring_node_exporter.xml.in

service_monitoring_prometheus.xml.in

smoketest/

scripts/

cli/

test_service_monitoring_frr-exporter.py

test_service_monitoring_node-exporter.py

	test_service_monitoring_prometheus.py
	test_service_monitoring_node-exporter.py

src/

conf_mode/

service_monitoring_frr-exporter.py

service_monitoring_node-exporter.py

service_monitoring_prometheus.py

migration-scripts/

monitoring/

1-to-2

rVYOSONEX637e4cef5ba2

View Options

data/templates/frr_exporter

View Options

data/templates/frr_exporter/frr_exporter.service.j2

View Options

data/templates/node_exporter

View Options

data/templates/node_exporter/node_exporter.service.j2

View Options

data/templates/prometheus/frr_exporter.service.j2

View Options

data/templates/prometheus/node_exporter.service.j2

View Options

debian/control

View Options

interface-definitions/include/version/monitoring-version.xml.i

View Options

interface-definitions/service_monitoring_frr_exporter.xml.in

View Options

interface-definitions/service_monitoring_node_exporter.xml.in

View Options

interface-definitions/service_monitoring_prometheus.xml.in

View Options

smoketest/scripts/cli/test_service_monitoring_frr-exporter.py

View Options

smoketest/scripts/cli/test_service_monitoring_node-exporter.py

View Options

smoketest/scripts/cli/test_service_monitoring_prometheus.py

View Options

src/conf_mode/service_monitoring_frr-exporter.py

View Options

src/conf_mode/service_monitoring_node-exporter.py

View Options

src/conf_mode/service_monitoring_prometheus.py

View Options

src/migration-scripts/monitoring/1-to-2

Merge pull request #4242 from nvollmar/T6953637e4cef5ba2Actions

Description

Details

Event Timeline

Merged Changes

Changes (19)

rVYOSONEX637e4cef5ba2

data/templates/frr_exporter

data/templates/frr_exporter/frr_exporter.service.j2

data/templates/node_exporter

data/templates/node_exporter/node_exporter.service.j2

data/templates/prometheus/frr_exporter.service.j2

data/templates/prometheus/node_exporter.service.j2

debian/control

interface-definitions/include/version/monitoring-version.xml.i

interface-definitions/service_monitoring_frr_exporter.xml.in

interface-definitions/service_monitoring_node_exporter.xml.in

interface-definitions/service_monitoring_prometheus.xml.in

smoketest/scripts/cli/test_service_monitoring_frr-exporter.py

smoketest/scripts/cli/test_service_monitoring_node-exporter.py

smoketest/scripts/cli/test_service_monitoring_prometheus.py

src/conf_mode/service_monitoring_frr-exporter.py

src/conf_mode/service_monitoring_node-exporter.py

src/conf_mode/service_monitoring_prometheus.py

src/migration-scripts/monitoring/1-to-2

Merge pull request #4242 from nvollmar/T6953
637e4cef5ba2
Actions