From e423048e7fa33c16095e51abff6ca234537479aa Mon Sep 17 00:00:00 2001 From: Miroslav Bagljas Date: Fri, 31 Mar 2017 16:28:52 +0200 Subject: [PATCH 1/2] Fixed invalid graph description for network monitoring Network monitoring graphs were showing $1 instead of interface name. Issue erigones/esdc-ce#112 --- .../roles/esdc-mon/files/templates/t_erigonos.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ansible/roles/esdc-mon/files/templates/t_erigonos.json b/ansible/roles/esdc-mon/files/templates/t_erigonos.json index ed40d9d2..98b877e7 100644 --- a/ansible/roles/esdc-mon/files/templates/t_erigonos.json +++ b/ansible/roles/esdc-mon/files/templates/t_erigonos.json @@ -1661,7 +1661,7 @@ "password": "", "snmpv3_privpassphrase": "", "snmpv3_privprotocol": "0", - "name": "Incoming errors on $1", + "name": "Incoming errors on {#IFNAME}", "applications": [ { "name": "Network interfaces" @@ -1704,7 +1704,7 @@ "password": "", "snmpv3_privpassphrase": "", "snmpv3_privprotocol": "0", - "name": "Incoming network traffic on $1", + "name": "Incoming network traffic on {#IFNAME}", "applications": [ { "name": "Network interfaces" @@ -1747,7 +1747,7 @@ "password": "", "snmpv3_privpassphrase": "", "snmpv3_privprotocol": "0", - "name": "Incoming packets on $1", + "name": "Incoming packets on {#IFNAME}", "applications": [ { "name": "Network interfaces" @@ -1790,7 +1790,7 @@ "password": "", "snmpv3_privpassphrase": "", "snmpv3_privprotocol": "0", - "name": "Outgoing errors on $1", + "name": "Outgoing errors on {#IFNAME}", "applications": [ { "name": "Network interfaces" @@ -1833,7 +1833,7 @@ "password": "", "snmpv3_privpassphrase": "", "snmpv3_privprotocol": "0", - "name": "Outgoing network traffic on $1", + "name": "Outgoing network traffic on {#IFNAME}", "applications": [ { "name": "Network interfaces" @@ -1876,7 +1876,7 @@ "password": "", "snmpv3_privpassphrase": "", "snmpv3_privprotocol": "0", - "name": "Outgoing packets on $1", + "name": "Outgoing packets on {#IFNAME}", "applications": [ { "name": "Network interfaces" From 16d50b3f265a4ba966f2a13e94c651251453dc68 Mon Sep 17 00:00:00 2001 From: Miroslav Bagljas Date: Fri, 31 Mar 2017 16:56:03 +0200 Subject: [PATCH 2/2] Updated changelog --- docs/appliances.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/appliances.rst b/docs/appliances.rst index 88243329..4af0d799 100644 --- a/docs/appliances.rst +++ b/docs/appliances.rst @@ -338,6 +338,7 @@ Changelog - Fixed exec parameters of default media types - `#29 `__ - Fixed FS discovery in t_linux and t_erigonos templates - `#30 `__ - Fixed node hard disk discovery and added trigger on SCSI errors into t_solaris_disk - commit `273ad34 `__ +- Fixed invalid graph description for network monitoring in t_erigonos - `#34 `__ - `#112 `__ 2.5.1 ~~~~~