From 59338794c8ae8ff82c00dc14ea47a9279cc213d4 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Tue, 30 Jun 2020 13:29:27 +0100 Subject: Rename collectd container to barometer-collectd-latest Change-Id: I0dfff659b4e05e3e619ea62f1771db79f7a8f0df Signed-off-by: Emma Foley --- docker/README_collectd | 18 +- docker/ansible/default.inv | 4 +- .../roles/config_files/tasks/snmp_agent.yml | 4 +- .../templates/latest/snmp_agent.conf.j2 | 398 +++++++++++++++++++++ .../templates/master/snmp_agent.conf.j2 | 398 --------------------- docker/ansible/roles/run_collectd/vars/main.yml | 2 +- docker/barometer-collectd-experimental/Dockerfile | 2 +- docker/barometer-collectd-latest/Dockerfile | 45 +++ docker/barometer-collectd-latest/run_collectd.sh | 16 + docker/barometer-collectd-master/Dockerfile | 45 --- docker/barometer-collectd-master/run_collectd.sh | 16 - 11 files changed, 474 insertions(+), 474 deletions(-) create mode 100644 docker/ansible/roles/config_files/templates/latest/snmp_agent.conf.j2 delete mode 100644 docker/ansible/roles/config_files/templates/master/snmp_agent.conf.j2 create mode 100644 docker/barometer-collectd-latest/Dockerfile create mode 100644 docker/barometer-collectd-latest/run_collectd.sh delete mode 100644 docker/barometer-collectd-master/Dockerfile delete mode 100644 docker/barometer-collectd-master/run_collectd.sh (limited to 'docker') diff --git a/docker/README_collectd b/docker/README_collectd index baa0ff6e..cf497105 100644 --- a/docker/README_collectd +++ b/docker/README_collectd @@ -9,7 +9,7 @@ Table of content: 1. DESCRIPTION 2. SYSTEM REQUIREMENTS 3. INSTALLATION NOTES - barometer-collectd -4. INSTALLATION NOTES - barometer-collectd-master +4. INSTALLATION NOTES - barometer-collectd-latest 5. ADDITIONAL STEPS ------------------------------------------------------------------------------ @@ -18,7 +18,7 @@ Table of content: This Dockerfile provides instruction for building collect in isolated container. There are currently two variants of collectd container: - barometer-collectd - it is based on stable collect release - - barometer-collectd-master - development container that is based on + - barometer-collectd-latest - development container that is based on latest 'main' branch for collectd project. It contains all available collectd plugins and features that are available on 'main' branch but some issues with configuration or stability may occur @@ -46,22 +46,22 @@ sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs:/op /opt/collectd/sbin/collectd -f ------------------------------------------------------------------------------ -4. INSTALLATION NOTES: barometer-collectd-master (development container) +4. INSTALLATION NOTES: barometer-collectd-latest (development container) -To build docker barometer-collectd-master container run (it is based on main branch from collectd): -sudo docker build -f ./docker/barometer-collectd-master/Dockerfile . +To build docker barometer-collectd-latest container run (it is based on main branch from collectd): +sudo docker build -f ./docker/barometer-collectd-latest/Dockerfile . from root barometer folder. To run builded image run sudo docker images # get docker image id -sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs-master:/opt/collectd/etc/collectd.conf.d \ +sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs-latest:/opt/collectd/etc/collectd.conf.d \ -v /var/run:/var/run -v /tmp:/tmp --privileged -NOTE: barometer-collectd-master container uses a different sample configurations files -compared to regular barometer-collectd container (src/collectd/collectd_sample_configs-master) +NOTE: barometer-collectd-latest container uses a different sample configurations files +compared to regular barometer-collectd container (src/collectd/collectd_sample_configs-latest) To make some changes run -sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs-master:/opt/collectd/etc/collectd.conf.d \ +sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs-latest:/opt/collectd/etc/collectd.conf.d \ -v /var/run:/var/run -v /tmp:/tmp --privileged --entrypoint=/bin/bash /opt/collectd/sbin/collectd -f diff --git a/docker/ansible/default.inv b/docker/ansible/default.inv index e254c26a..17b53c3b 100644 --- a/docker/ansible/default.inv +++ b/docker/ansible/default.inv @@ -13,8 +13,8 @@ localhost [collectd_hosts:vars] install_mcelog=true insert_ipmi_modules=true -#to use master or experimental container set the collectd flavor below -#possible values: stable|master|experimental +#to use latest or experimental container set the collectd flavor below +#possible values: stable|latest|experimental flavor=stable [influxdb_hosts] diff --git a/docker/ansible/roles/config_files/tasks/snmp_agent.yml b/docker/ansible/roles/config_files/tasks/snmp_agent.yml index c72aee48..797f9732 100644 --- a/docker/ansible/roles/config_files/tasks/snmp_agent.yml +++ b/docker/ansible/roles/config_files/tasks/snmp_agent.yml @@ -21,9 +21,9 @@ tags: - snmp -- name: enable snmp agent for master container +- name: enable snmp agent for latest container template: - src: master/snmp_agent.conf.j2 + src: latest/snmp_agent.conf.j2 dest: "{{ config_file_dir }}/snmp_agent.conf" when: flavor|default('stable')|string != 'stable' tags: diff --git a/docker/ansible/roles/config_files/templates/latest/snmp_agent.conf.j2 b/docker/ansible/roles/config_files/templates/latest/snmp_agent.conf.j2 new file mode 100644 index 00000000..1ff8b228 --- /dev/null +++ b/docker/ansible/roles/config_files/templates/latest/snmp_agent.conf.j2 @@ -0,0 +1,398 @@ +# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +LoadPlugin snmp_agent + + +# Intel PMU MIB + + IndexOID "INTEL-PMU-MIB::pmuGroupIndex" + + + Source "PluginInstance" + + Plugin "intel_pmu" + OIDs "INTEL-PMU-MIB::pmuGroupDescr" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "L1-dcache-loads" + OIDs "INTEL-PMU-MIB::pmuL1DCacheLoads" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "L1-dcache-load-misses" + OIDs "INTEL-PMU-MIB::pmuL1DCacheLoadMisses" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "L1-dcache-stores" + OIDs "INTEL-PMU-MIB::pmuL1DCacheStores" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "L1-dcache-store-misses" + OIDs "INTEL-PMU-MIB::pmuL1DCacheStoreMisses" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "L1-dcache-prefetches" + OIDs "INTEL-PMU-MIB::pmuL1DCachePrefetches" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "L1-dcache-prefetch-misses" + OIDs "INTEL-PMU-MIB::pmuL1DCachePrefetchMisses" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "L1-icache-loads" + OIDs "INTEL-PMU-MIB::pmuL1ICacheLoads" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "L1-icache-load-misses" + OIDs "INTEL-PMU-MIB::pmuL1ICacheLoadMisses" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "L1-icache-prefetches" + OIDs "INTEL-PMU-MIB::pmuL1ICachePrefetches" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "L1-icache-prefetch-misses" + OIDs "INTEL-PMU-MIB::pmuL1ICachePrefetchMisses" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "LLC-loads" + OIDs "INTEL-PMU-MIB::pmuLLCLoads" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "LLC-load-misses" + OIDs "INTEL-PMU-MIB::pmuLLCLoadMisses" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "LLC-stores" + OIDs "INTEL-PMU-MIB::pmuLLCStores" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "LLC-store-misses" + OIDs "INTEL-PMU-MIB::pmuLLCStoreMisses" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "LLC-prefetches" + OIDs "INTEL-PMU-MIB::pmuLLCPrefetches" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "LLC-prefetch-misses" + OIDs "INTEL-PMU-MIB::pmuLLCPrefetchMisses" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "dTLB-loads" + OIDs "INTEL-PMU-MIB::pmuDTLBLoads" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "dTLB-load-misses" + OIDs "INTEL-PMU-MIB::pmuDTLBLoadMisses" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "dTLB-stores" + OIDs "INTEL-PMU-MIB::pmuDTLBStores" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "dTLB-store-misses" + OIDs "INTEL-PMU-MIB::pmuDTLBStoreMisses" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "dTLB-prefetches" + OIDs "INTEL-PMU-MIB::pmuDTLBPrefetches" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "dTLB-prefetch-misses" + OIDs "INTEL-PMU-MIB::pmuDTLBPrefetchMisses" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "iTLB-loads" + OIDs "INTEL-PMU-MIB::pmuITLBLoads" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "iTLB-load-misses" + OIDs "INTEL-PMU-MIB::pmuITLBLoadMisses" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "branch-loads" + OIDs "INTEL-PMU-MIB::pmuBranchLoads" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "branch-load-misses" + OIDs "INTEL-PMU-MIB::pmuBranchLoadMisses" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "cpu-cycles" + OIDs "INTEL-PMU-MIB::pmuCpuCycles" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "instructions" + OIDs "INTEL-PMU-MIB::pmuInstructions" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "cache-references" + OIDs "INTEL-PMU-MIB::pmuCacheReferences" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "cache-misses" + OIDs "INTEL-PMU-MIB::pmuCacheMisses" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "branches" + OIDs "INTEL-PMU-MIB::pmuBranches" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "branch-misses" + OIDs "INTEL-PMU-MIB::pmuBranchMisses" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "bus-cycles" + OIDs "INTEL-PMU-MIB::pmuBusCycles" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "cpu-clock" + OIDs "INTEL-PMU-MIB::pmuCpuClock" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "task-clock" + OIDs "INTEL-PMU-MIB::pmuTaskClock" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "context-switches" + OIDs "INTEL-PMU-MIB::pmuContextSwitches" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "cpu-migrations" + OIDs "INTEL-PMU-MIB::pmuCpuMigrations" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "page-faults" + OIDs "INTEL-PMU-MIB::pmuPageFaults" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "minor-faults" + OIDs "INTEL-PMU-MIB::pmuMinorFaults" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "major-faults" + OIDs "INTEL-PMU-MIB::pmuMajorFaults" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "alignment-faults" + OIDs "INTEL-PMU-MIB::pmuAlignmentFaults" + + + Plugin "intel_pmu" + Type "counter" + TypeInstance "emulation-faults" + OIDs "INTEL-PMU-MIB::pmuEmulationFaults" + +
+# Intel RDT MIB + + IndexOID "INTEL-RDT-MIB::rdtGroupIndex" + SizeOID "INTEL-RDT-MIB::rdtGroupNumber" + + + Source "PluginInstance" + + Plugin "intel_rdt" + OIDs "INTEL-RDT-MIB::rdtGroupDescr" + + + Plugin "intel_rdt" + Type "bytes" + TypeInstance "llc" + OIDs "INTEL-RDT-MIB::rdtLlc" + + + Plugin "intel_rdt" + Type "ipc" + OIDs "INTEL-RDT-MIB::rdtIpc" + + + Plugin "intel_rdt" + Type "memory_bandwidth" + TypeInstance "remote" + OIDs "INTEL-RDT-MIB::rdtMbmRemote" + + + Plugin "intel_rdt" + Type "memory_bandwidth" + TypeInstance "local" + OIDs "INTEL-RDT-MIB::rdtMbmLocal" + +
+# Intel Mcelog MIB + + IndexOID "INTEL-MCELOG-MIB::memoryGroupIndex" + + + Source "PluginInstance" + + Plugin "mcelog" + OIDs "INTEL-MCELOG-MIB::memoryGroupDescr" + + + Plugin "mcelog" + Type "errors" + TypeInstance "corrected_memory_errors" + OIDs "INTEL-MCELOG-MIB::memoryCorrectedErrors" + + + Plugin "mcelog" + Type "errors" + TypeInstance "corrected_memory_errors_in_24h" + OIDs "INTEL-MCELOG-MIB::memoryCorrectedTimedErrors" + + + Plugin "mcelog" + Type "errors" + TypeInstance "uncorrected_memory_errors" + OIDs "INTEL-MCELOG-MIB::memoryUncorrectedErrors" + + + Plugin "mcelog" + Type "errors" + TypeInstance "uncorrected_memory_errors_in_24h" + OIDs "INTEL-MCELOG-MIB::memoryUncorrectedTimedErrors" + +
+# Hugepages + + + + Source "PluginInstance" + + Plugin "hugepages" + OIDs "INTEL-HUGEPAGES-MIB::hugepagesNode" + + + Plugin "hugepages" + Type "memory" + TypeInstance "free" + OIDs "INTEL-HUGEPAGES-MIB::hugepagesMemoryFree" + + + Plugin "hugepages" + Type "memory" + TypeInstance "used" + OIDs "INTEL-HUGEPAGES-MIB::hugepagesMemoryUsed" + + + Plugin "hugepages" + Type "vmpage_number" + TypeInstance "free" + OIDs "INTEL-HUGEPAGES-MIB::hugepagesPagesFree" + + + Plugin "hugepages" + Type "vmpage_number" + TypeInstance "used" + OIDs "INTEL-HUGEPAGES-MIB::hugepagesPagesUsed" + + + Plugin "hugepages" + Type "percent" + TypeInstance "free" + OIDs "INTEL-HUGEPAGES-MIB::hugepagesPercentFree" + + + Plugin "hugepages" + Type "percent" + TypeInstance "used" + OIDs "INTEL-HUGEPAGES-MIB::hugepagesPercentUsed" + +
+ diff --git a/docker/ansible/roles/config_files/templates/master/snmp_agent.conf.j2 b/docker/ansible/roles/config_files/templates/master/snmp_agent.conf.j2 deleted file mode 100644 index 1ff8b228..00000000 --- a/docker/ansible/roles/config_files/templates/master/snmp_agent.conf.j2 +++ /dev/null @@ -1,398 +0,0 @@ -# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -LoadPlugin snmp_agent - - -# Intel PMU MIB - - IndexOID "INTEL-PMU-MIB::pmuGroupIndex" - - - Source "PluginInstance" - - Plugin "intel_pmu" - OIDs "INTEL-PMU-MIB::pmuGroupDescr" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "L1-dcache-loads" - OIDs "INTEL-PMU-MIB::pmuL1DCacheLoads" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "L1-dcache-load-misses" - OIDs "INTEL-PMU-MIB::pmuL1DCacheLoadMisses" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "L1-dcache-stores" - OIDs "INTEL-PMU-MIB::pmuL1DCacheStores" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "L1-dcache-store-misses" - OIDs "INTEL-PMU-MIB::pmuL1DCacheStoreMisses" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "L1-dcache-prefetches" - OIDs "INTEL-PMU-MIB::pmuL1DCachePrefetches" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "L1-dcache-prefetch-misses" - OIDs "INTEL-PMU-MIB::pmuL1DCachePrefetchMisses" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "L1-icache-loads" - OIDs "INTEL-PMU-MIB::pmuL1ICacheLoads" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "L1-icache-load-misses" - OIDs "INTEL-PMU-MIB::pmuL1ICacheLoadMisses" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "L1-icache-prefetches" - OIDs "INTEL-PMU-MIB::pmuL1ICachePrefetches" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "L1-icache-prefetch-misses" - OIDs "INTEL-PMU-MIB::pmuL1ICachePrefetchMisses" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "LLC-loads" - OIDs "INTEL-PMU-MIB::pmuLLCLoads" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "LLC-load-misses" - OIDs "INTEL-PMU-MIB::pmuLLCLoadMisses" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "LLC-stores" - OIDs "INTEL-PMU-MIB::pmuLLCStores" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "LLC-store-misses" - OIDs "INTEL-PMU-MIB::pmuLLCStoreMisses" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "LLC-prefetches" - OIDs "INTEL-PMU-MIB::pmuLLCPrefetches" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "LLC-prefetch-misses" - OIDs "INTEL-PMU-MIB::pmuLLCPrefetchMisses" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "dTLB-loads" - OIDs "INTEL-PMU-MIB::pmuDTLBLoads" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "dTLB-load-misses" - OIDs "INTEL-PMU-MIB::pmuDTLBLoadMisses" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "dTLB-stores" - OIDs "INTEL-PMU-MIB::pmuDTLBStores" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "dTLB-store-misses" - OIDs "INTEL-PMU-MIB::pmuDTLBStoreMisses" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "dTLB-prefetches" - OIDs "INTEL-PMU-MIB::pmuDTLBPrefetches" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "dTLB-prefetch-misses" - OIDs "INTEL-PMU-MIB::pmuDTLBPrefetchMisses" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "iTLB-loads" - OIDs "INTEL-PMU-MIB::pmuITLBLoads" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "iTLB-load-misses" - OIDs "INTEL-PMU-MIB::pmuITLBLoadMisses" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "branch-loads" - OIDs "INTEL-PMU-MIB::pmuBranchLoads" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "branch-load-misses" - OIDs "INTEL-PMU-MIB::pmuBranchLoadMisses" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "cpu-cycles" - OIDs "INTEL-PMU-MIB::pmuCpuCycles" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "instructions" - OIDs "INTEL-PMU-MIB::pmuInstructions" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "cache-references" - OIDs "INTEL-PMU-MIB::pmuCacheReferences" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "cache-misses" - OIDs "INTEL-PMU-MIB::pmuCacheMisses" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "branches" - OIDs "INTEL-PMU-MIB::pmuBranches" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "branch-misses" - OIDs "INTEL-PMU-MIB::pmuBranchMisses" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "bus-cycles" - OIDs "INTEL-PMU-MIB::pmuBusCycles" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "cpu-clock" - OIDs "INTEL-PMU-MIB::pmuCpuClock" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "task-clock" - OIDs "INTEL-PMU-MIB::pmuTaskClock" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "context-switches" - OIDs "INTEL-PMU-MIB::pmuContextSwitches" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "cpu-migrations" - OIDs "INTEL-PMU-MIB::pmuCpuMigrations" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "page-faults" - OIDs "INTEL-PMU-MIB::pmuPageFaults" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "minor-faults" - OIDs "INTEL-PMU-MIB::pmuMinorFaults" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "major-faults" - OIDs "INTEL-PMU-MIB::pmuMajorFaults" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "alignment-faults" - OIDs "INTEL-PMU-MIB::pmuAlignmentFaults" - - - Plugin "intel_pmu" - Type "counter" - TypeInstance "emulation-faults" - OIDs "INTEL-PMU-MIB::pmuEmulationFaults" - -
-# Intel RDT MIB - - IndexOID "INTEL-RDT-MIB::rdtGroupIndex" - SizeOID "INTEL-RDT-MIB::rdtGroupNumber" - - - Source "PluginInstance" - - Plugin "intel_rdt" - OIDs "INTEL-RDT-MIB::rdtGroupDescr" - - - Plugin "intel_rdt" - Type "bytes" - TypeInstance "llc" - OIDs "INTEL-RDT-MIB::rdtLlc" - - - Plugin "intel_rdt" - Type "ipc" - OIDs "INTEL-RDT-MIB::rdtIpc" - - - Plugin "intel_rdt" - Type "memory_bandwidth" - TypeInstance "remote" - OIDs "INTEL-RDT-MIB::rdtMbmRemote" - - - Plugin "intel_rdt" - Type "memory_bandwidth" - TypeInstance "local" - OIDs "INTEL-RDT-MIB::rdtMbmLocal" - -
-# Intel Mcelog MIB - - IndexOID "INTEL-MCELOG-MIB::memoryGroupIndex" - - - Source "PluginInstance" - - Plugin "mcelog" - OIDs "INTEL-MCELOG-MIB::memoryGroupDescr" - - - Plugin "mcelog" - Type "errors" - TypeInstance "corrected_memory_errors" - OIDs "INTEL-MCELOG-MIB::memoryCorrectedErrors" - - - Plugin "mcelog" - Type "errors" - TypeInstance "corrected_memory_errors_in_24h" - OIDs "INTEL-MCELOG-MIB::memoryCorrectedTimedErrors" - - - Plugin "mcelog" - Type "errors" - TypeInstance "uncorrected_memory_errors" - OIDs "INTEL-MCELOG-MIB::memoryUncorrectedErrors" - - - Plugin "mcelog" - Type "errors" - TypeInstance "uncorrected_memory_errors_in_24h" - OIDs "INTEL-MCELOG-MIB::memoryUncorrectedTimedErrors" - -
-# Hugepages - - - - Source "PluginInstance" - - Plugin "hugepages" - OIDs "INTEL-HUGEPAGES-MIB::hugepagesNode" - - - Plugin "hugepages" - Type "memory" - TypeInstance "free" - OIDs "INTEL-HUGEPAGES-MIB::hugepagesMemoryFree" - - - Plugin "hugepages" - Type "memory" - TypeInstance "used" - OIDs "INTEL-HUGEPAGES-MIB::hugepagesMemoryUsed" - - - Plugin "hugepages" - Type "vmpage_number" - TypeInstance "free" - OIDs "INTEL-HUGEPAGES-MIB::hugepagesPagesFree" - - - Plugin "hugepages" - Type "vmpage_number" - TypeInstance "used" - OIDs "INTEL-HUGEPAGES-MIB::hugepagesPagesUsed" - - - Plugin "hugepages" - Type "percent" - TypeInstance "free" - OIDs "INTEL-HUGEPAGES-MIB::hugepagesPercentFree" - - - Plugin "hugepages" - Type "percent" - TypeInstance "used" - OIDs "INTEL-HUGEPAGES-MIB::hugepagesPercentUsed" - -
- diff --git a/docker/ansible/roles/run_collectd/vars/main.yml b/docker/ansible/roles/run_collectd/vars/main.yml index cebd0f47..90d6a4f0 100644 --- a/docker/ansible/roles/run_collectd/vars/main.yml +++ b/docker/ansible/roles/run_collectd/vars/main.yml @@ -15,7 +15,7 @@ default_flavor: "{{ flavor|default('stable')|string }}" flavor_image_name: "{{ - 'barometer-collectd-master' if (default_flavor == 'master') else + 'barometer-collectd-latest' if (default_flavor == 'latest') else 'barometer-collectd-experimental' if (default_flavor == 'experimental') else 'barometer-collectd' }}" collectd_image_name: "{{ 'opnfv/' + flavor_image_name }}" diff --git a/docker/barometer-collectd-experimental/Dockerfile b/docker/barometer-collectd-experimental/Dockerfile index 49016d9b..a9f262e4 100644 --- a/docker/barometer-collectd-experimental/Dockerfile +++ b/docker/barometer-collectd-experimental/Dockerfile @@ -34,7 +34,7 @@ COPY docker/barometer-collectd-experimental/collectd_apply_pull_request.sh \ # copying additional experimental configs on top of configs for 'main' # branch release COPY docker/barometer-collectd-experimental/experimental-configs/* \ - ${repos_dir}/barometer/src/collectd/collectd_sample_configs-master/ + ${repos_dir}/barometer/src/collectd/collectd_sample_configs-latest/ WORKDIR ${repos_dir}/barometer/systems RUN sh ./build_base_machine.sh && \ diff --git a/docker/barometer-collectd-latest/Dockerfile b/docker/barometer-collectd-latest/Dockerfile new file mode 100644 index 00000000..43b0ab06 --- /dev/null +++ b/docker/barometer-collectd-latest/Dockerfile @@ -0,0 +1,45 @@ +# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +FROM centos:7 +RUN yum update -y && \ + yum install -y which sudo git && \ + yum clean all && \ + git config --global http.sslVerify false + +ENV DOCKER y +ENV COLLECTD_FLAVOR latest +ENV WITH_DPDK y +ENV repos_dir /src +ENV openstack_plugins /src/barometer/src/collectd-openstack-plugins + +WORKDIR ${repos_dir} +RUN mkdir -p ${repos_dir}/barometer +COPY . ${repos_dir}/barometer + +WORKDIR ${repos_dir}/barometer/systems +RUN sh ./build_base_machine.sh && \ + useradd -ms /bin/bash collectd_exec && \ + echo "collectd_exec ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers + +WORKDIR ${openstack_plugins} +RUN make && \ + pip install --upgrade pip && \ + pip install -r ${openstack_plugins}/collectd-openstack-plugins/requirements.txt + +COPY docker/barometer-collectd-latest/run_collectd.sh /run_collectd.sh +RUN chmod +x /run_collectd.sh + +ENTRYPOINT ["/run_collectd.sh"] diff --git a/docker/barometer-collectd-latest/run_collectd.sh b/docker/barometer-collectd-latest/run_collectd.sh new file mode 100644 index 00000000..5920248a --- /dev/null +++ b/docker/barometer-collectd-latest/run_collectd.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# Copyright 2016-2019 Intel Corporation and OPNFV. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +/opt/collectd/sbin/collectd -f diff --git a/docker/barometer-collectd-master/Dockerfile b/docker/barometer-collectd-master/Dockerfile deleted file mode 100644 index 9637a486..00000000 --- a/docker/barometer-collectd-master/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -FROM centos:7 -RUN yum update -y && \ - yum install -y which sudo git && \ - yum clean all && \ - git config --global http.sslVerify false - -ENV DOCKER y -ENV COLLECTD_FLAVOR master -ENV WITH_DPDK y -ENV repos_dir /src -ENV openstack_plugins /src/barometer/src/collectd-openstack-plugins - -WORKDIR ${repos_dir} -RUN mkdir -p ${repos_dir}/barometer -COPY . ${repos_dir}/barometer - -WORKDIR ${repos_dir}/barometer/systems -RUN sh ./build_base_machine.sh && \ - useradd -ms /bin/bash collectd_exec && \ - echo "collectd_exec ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers - -WORKDIR ${openstack_plugins} -RUN make && \ - pip install --upgrade pip && \ - pip install -r ${openstack_plugins}/collectd-openstack-plugins/requirements.txt - -COPY docker/barometer-collectd-master/run_collectd.sh /run_collectd.sh -RUN chmod +x /run_collectd.sh - -ENTRYPOINT ["/run_collectd.sh"] diff --git a/docker/barometer-collectd-master/run_collectd.sh b/docker/barometer-collectd-master/run_collectd.sh deleted file mode 100644 index 5920248a..00000000 --- a/docker/barometer-collectd-master/run_collectd.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -# Copyright 2016-2019 Intel Corporation and OPNFV. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -/opt/collectd/sbin/collectd -f -- cgit 1.2.3-korg