From dc1363aaf5850dca402ec528d7b90a8423b3a72e Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 6 Jul 2021 13:06:03 -0400 Subject: [PATCH] create file for telegraf to read node config details --- .../dashboards/standalone/common_standalone.json.jinja | 4 +--- salt/telegraf/init.sls | 8 ++++++++ salt/telegraf/node_tab.json.jinja | 6 ++++++ 3 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 salt/telegraf/node_tab.json.jinja diff --git a/salt/grafana/dashboards/standalone/common_standalone.json.jinja b/salt/grafana/dashboards/standalone/common_standalone.json.jinja index 668eca22b..1d331e801 100644 --- a/salt/grafana/dashboards/standalone/common_standalone.json.jinja +++ b/salt/grafana/dashboards/standalone/common_standalone.json.jinja @@ -20,11 +20,9 @@ "iteration": 1625018989654, "links": [], "panels": [ - {% for panel in PANELS -%} {%- import_json "grafana/panels/" ~ panel ~ ".json.jinja" as panel %} -{{ panel | json }} {%- if not loop.last %},{% endif %} - +{{ panel | json }} {% if not loop.last %},{% endif %} {% endfor -%} ], diff --git a/salt/telegraf/init.sls b/salt/telegraf/init.sls index 14373fe9d..f057f2dfd 100644 --- a/salt/telegraf/init.sls +++ b/salt/telegraf/init.sls @@ -42,6 +42,14 @@ tgrafconf: - template: jinja - source: salt://telegraf/etc/telegraf.conf +#this file will be read by telegraf to send node details(management interface, monitor interface, etc) +# into influx so that grafan can build dashboards using queries +node_tab: + file.managed: + - name: /opt/so/conf/telegraf/node_tab.json + - source: salt://telegraf/node_tab.json.jinja + - template: jinja + so-telegraf: docker_container.running: - image: {{ MANAGER }}:5000/{{ IMAGEREPO }}/so-telegraf:{{ VERSION }} diff --git a/salt/telegraf/node_tab.json.jinja b/salt/telegraf/node_tab.json.jinja new file mode 100644 index 000000000..891e944a3 --- /dev/null +++ b/salt/telegraf/node_tab.json.jinja @@ -0,0 +1,6 @@ +{% for tabtype in ['managertab', 'managersearchtab', 'standalonetab', 'sensorstab', 'nodestab', 'evaltab'] %} + {% set node_type_data = salt['pillar.get'](tabtype, False) %} + {% if node_type_data %} + {{ node_type_data | json }} + {% endif %} +{% endfor %}