Merge "Moving DPDK Verion From 16.11 to 18.11. Updated the related section in usergui...

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 1157c4a..48bb709 100644 (file)
--- 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 a4511a9..7452cca 100644 (file)
--- 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>