diff options
| author |   Emma Foley <efoley@redhat.com> | 2020-05-28 17:29:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-05-28 17:29:50 +0000 |
| commit | cb32efb5873b44561e2ca3ca337636c7af035734 (patch) | |
| tree | cfc98390f4eacb2a6b96a3dba829c059f1082067 | |
| parent | c3abd20ec45fd07bdb4a760f35c7ded447230319 (diff) | |
| parent | 0fd9bb4de6894a7ebd8d89592884d624c00837ee (diff) | |
Merge "Update SNMP agent config"
| -rw-r--r-- | docker/ansible/roles/config_files/templates/snmp_agent.conf.j2 | 19 | ||||
| -rw-r--r-- | src/collectd/collectd_sample_configs/snmp_agent.conf | 4 |
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> |