Merge pull request #1315 from sever-sever/T4315-equ

monitoring: T4315: Add telegraf output plugin prometheus-client

2 files changed, 22 insertions, 0 deletions

diff --git a/data/templates/monitoring/override.conf.tmpl b/data/templates/monitoring/override.conf.tmpl
index f8f150791..00dbc63a0 100644
--- a/data/templates/monitoring/override.conf.tmpl
+++ b/data/templates/monitoring/override.conf.tmpl
@@ -2,6 +2,8 @@
 After=vyos-router.service
 ConditionPathExists=/run/telegraf/vyos-telegraf.conf
 [Service]
+{% if influxdb_configured is defined %}
 Environment=INFLUX_TOKEN={{ authentication.token }}
+{% endif %}
 CapabilityBoundingSet=CAP_NET_RAW CAP_NET_ADMIN CAP_SYS_ADMIN
 AmbientCapabilities=CAP_NET_RAW CAP_NET_ADMIN
diff --git a/data/templates/monitoring/telegraf.tmpl b/data/templates/monitoring/telegraf.tmpl
index cf33eec4e..f80dc5f45 100644
--- a/data/templates/monitoring/telegraf.tmpl
+++ b/data/templates/monitoring/telegraf.tmpl
@@ -14,12 +14,30 @@
   logfile = ""
   hostname = ""
   omit_hostname = false
+{% if influxdb_configured is defined %}
 [[outputs.influxdb_v2]]
   urls = ["{{ url }}:{{ port }}"]
   insecure_skip_verify = true
   token = "$INFLUX_TOKEN"
   organization = "{{ authentication.organization }}"
   bucket = "{{ bucket }}"
+{% endif %}
+{% if prometheus_client is defined %}
+ [[outputs.prometheus_client]]
+   ## Address to listen on
+   listen = "{{ prometheus_client.listen_address if prometheus_client.listen_address is defined else '' }}:{{ prometheus_client.port }}"
+   metric_version = {{ prometheus_client.metric_version }}
+{%     if prometheus_client.authentication is defined %}
+{%          if prometheus_client.authentication.username is defined and prometheus_client.authentication.username is not none and prometheus_client.authentication.password is defined and prometheus_client.authentication.password is not none  %}
+   ## Use HTTP Basic Authentication
+   basic_username = "{{ prometheus_client.authentication.username }}"
+   basic_password = "{{ prometheus_client.authentication.password }}"
+{%          endif %}
+{%     endif %}
+{%     if prometheus_client.allow_from is defined and prometheus_client.allow_from is not none %}
+   ip_range = {{ prometheus_client.allow_from }}
+{%     endif %}
+{% endif %}
 [[inputs.cpu]]
     percpu = true
     totalcpu = true
@@ -50,6 +68,7 @@
   server = "unixgram:///run/telegraf/telegraf_syslog.sock"
   best_effort = true
   syslog_standard = "RFC3164"
+{% if influxdb_configured is defined %}
 [[inputs.exec]]
   commands = [
     "{{ custom_scripts_dir }}/show_firewall_input_filter.py",
@@ -58,3 +77,4 @@
   ]
   timeout = "10s"
   data_format = "influx"
+{% endif %}