Update SNMP agent config

The one-click install was not working with SNMP. The manual install
also wasn't working due to the ``Instance true`` config option in
the config. ``Instance true`` is not a valid config option for snmp
agent.
This option appears in the stable container config, and also in the
ansible config, but not in the master container. Removing this
unsupported option allows the config to be read and collectd to be
started.

JIRA: BAROMETER-134
Signed-off-by: Emma Foley <efoley@redhat.com>
Change-Id: If154b3190d82d1cd3638a9c258d2b48bb0efe9af

2 files changed, 14 insertions, 9 deletions

diff --git a/docker/ansible/roles/config_files/templates/snmp_agent.conf.j2 b/docker/ansible/roles/config_files/templates/snmp_agent.conf.j2
index 1157c4a2..48bb709f 100644
--- a/docker/ansible/roles/config_files/templates/snmp_agent.conf.j2
+++ b/docker/ansible/roles/config_files/templates/snmp_agent.conf.j2
@@ -12,13 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#LoadPlugin snmp_agent
+LoadPlugin snmp_agent
+
 <Plugin snmp_agent>
 # Intel PMU MIB
   <Table "pmuTable">
     IndexOID "INTEL-PMU-MIB::pmuGroupIndex"
     <Data "pmuGroupDescr">
-      Instance true
+      <IndexKey>
+        Source "PluginInstance"
+      </IndexKey>
       Plugin "intel_pmu"
       OIDs "INTEL-PMU-MIB::pmuGroupDescr"
     </Data>
@@ -280,7 +283,9 @@
     IndexOID "INTEL-RDT-MIB::rdtGroupIndex"
     SizeOID "INTEL-RDT-MIB::rdtGroupNumber"
     <Data "rdtGroupDescr">
-      Instance true
+      <IndexKey>
+        Source "PluginInstance"
+      </IndexKey>
       Plugin "intel_rdt"
       OIDs "INTEL-RDT-MIB::rdtGroupDescr"
     </Data>
@@ -312,7 +317,9 @@
   <Table "mcelogTable">
     IndexOID "INTEL-MCELOG-MIB::memoryGroupIndex"
     <Data "memoryGroupDescr">
-      Instance true
+      <IndexKey>
+        Source "PluginInstance"
+      </IndexKey>
       Plugin "mcelog"
       OIDs "INTEL-MCELOG-MIB::memoryGroupDescr"
     </Data>
@@ -344,7 +351,9 @@
 # Hugepages
   <Table "hugepagesTable">
     <Data "hugepagesNode">
-      Instance true
+      <IndexKey>
+        Source "PluginInstance"
+      </IndexKey>
       Plugin "hugepages"
       OIDs "INTEL-HUGEPAGES-MIB::hugepagesNode"
     </Data>
diff --git a/src/collectd/collectd_sample_configs/snmp_agent.conf b/src/collectd/collectd_sample_configs/snmp_agent.conf
index a4511a94..7452ccae 100644
--- a/src/collectd/collectd_sample_configs/snmp_agent.conf
+++ b/src/collectd/collectd_sample_configs/snmp_agent.conf
@@ -17,7 +17,6 @@ LoadPlugin snmp_agent
   <Table "pmuTable">
     IndexOID "INTEL-PMU-MIB::pmuGroupIndex"
     <Data "pmuGroupDescr">
-      Instance true
       Plugin "intel_pmu"
       OIDs "INTEL-PMU-MIB::pmuGroupDescr"
     </Data>
@@ -279,7 +278,6 @@ LoadPlugin snmp_agent
     IndexOID "INTEL-RDT-MIB::rdtGroupIndex"
     SizeOID "INTEL-RDT-MIB::rdtGroupNumber"
     <Data "rdtGroupDescr">
-      Instance true
       Plugin "intel_rdt"
       OIDs "INTEL-RDT-MIB::rdtGroupDescr"
     </Data>
@@ -311,7 +309,6 @@ LoadPlugin snmp_agent
   <Table "mcelogTable">
     IndexOID "INTEL-MCELOG-MIB::memoryGroupIndex"
     <Data "memoryGroupDescr">
-      Instance true
       Plugin "mcelog"
       OIDs "INTEL-MCELOG-MIB::memoryGroupDescr"
     </Data>
@@ -343,7 +340,6 @@ LoadPlugin snmp_agent
 # Hugepages
   <Table "hugepagesTable">
     <Data "hugepagesNode">
-      Instance true
       Plugin "hugepages"
       OIDs "INTEL-HUGEPAGES-MIB::hugepagesNode"
     </Data>