diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-07-08 07:26:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-08 07:26:25 +0200 |
| commit | 44b1bdd3273dce4e74a5474c401ac7107950635b (patch) | |
| tree | 801c37767245d09633e413124040d837904f3baf /data | |
| parent | ff2665175fe58bff6f76f5ee57ebee6de838dbc5 (diff) | |
| parent | 40adf40a7d07b70f5a9c5f17540ee0c42ce9323f (diff) | |
| download | vyos-1x-44b1bdd3273dce4e74a5474c401ac7107950635b.tar.gz vyos-1x-44b1bdd3273dce4e74a5474c401ac7107950635b.zip | |
Merge pull request #1401 from sever-sever/T4411
monitoring: T4411: Migrate influxdb options to influxdb node
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/monitoring/override.conf.j2 | 2 | ||||
| -rw-r--r-- | data/templates/monitoring/telegraf.j2 | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/templates/monitoring/override.conf.j2 b/data/templates/monitoring/override.conf.j2 index f8f150791..9f1b4ebec 100644 --- a/data/templates/monitoring/override.conf.j2 +++ b/data/templates/monitoring/override.conf.j2 @@ -2,6 +2,6 @@ After=vyos-router.service ConditionPathExists=/run/telegraf/vyos-telegraf.conf [Service] -Environment=INFLUX_TOKEN={{ authentication.token }} +Environment=INFLUX_TOKEN={{ influxdb.authentication.token }} CapabilityBoundingSet=CAP_NET_RAW CAP_NET_ADMIN CAP_SYS_ADMIN AmbientCapabilities=CAP_NET_RAW CAP_NET_ADMIN diff --git a/data/templates/monitoring/telegraf.j2 b/data/templates/monitoring/telegraf.j2 index a732fb5de..6b395692b 100644 --- a/data/templates/monitoring/telegraf.j2 +++ b/data/templates/monitoring/telegraf.j2 @@ -31,14 +31,14 @@ {% endif %} ### End Azure Data Explorer ### {% endif %} -{% if influxdb_configured is vyos_defined %} +{% if influxdb is vyos_defined %} ### InfluxDB2 ### [[outputs.influxdb_v2]] - urls = ["{{ url }}:{{ port }}"] + urls = ["{{ influxdb.url }}:{{ influxdb.port }}"] insecure_skip_verify = true token = "$INFLUX_TOKEN" - organization = "{{ authentication.organization }}" - bucket = "{{ bucket }}" + organization = "{{ influxdb.authentication.organization }}" + bucket = "{{ influxdb.bucket }}" ### End InfluxDB2 ### {% endif %} {% if prometheus_client is vyos_defined %} |