From 5560c122f820a8a5ecabc4c24a6e9fd444163910 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Tue, 17 Nov 2020 13:58:22 +0000 Subject: [container][latest] Rename and update barometer-collectd-latest Collectd changed the upstream default to main, and Barometer added a few changes to incorporate this. One change was renaming the `barometer-collectd-master` container to `barometer-collectd-latest`, since `barometer-collectd-main` didn't make sense semantically, as we use the stable container as the "main" reference. At the time, we didn't have the changes made in releng to build the new container, so container renaming was paused. Now that the change is merged in releng (and has been for a while), and the containers are being updated, this change should happen, so that the container gets published. Signed-off-by: Emma Foley Change-Id: I4ee91c289b9e7477157bea148452be58343dc733 --- docker/README_collectd | 18 +- docker/barometer-collectd-latest/Dockerfile | 40 ++ docker/barometer-collectd-latest/run_collectd.sh | 16 + docker/barometer-collectd-master/Dockerfile | 45 -- docker/barometer-collectd-master/run_collectd.sh | 16 - docs/release/userguide/installguide.docker.rst | 49 +- .../collectd_sample_configs-latest/csv.conf | 19 + .../default_plugins.conf | 31 + .../collectd_sample_configs-latest/dpdkevents.conf | 35 + .../collectd_sample_configs-latest/dpdkstat.conf | 23 + .../collectd_sample_configs-latest/exec.conf | 20 + .../collectd_sample_configs-latest/hugepages.conf | 22 + .../collectd_sample_configs-latest/intel_pmu.conf | 23 + .../collectd_sample_configs-latest/kafka.conf | 21 + .../collectd_sample_configs-latest/mcelog.conf | 24 + .../collectd_sample_configs-latest/network.conf | 18 + .../collectd_sample_configs-latest/ovs_events.conf | 24 + .../ovs_pmd_stats.sh | 16 + .../collectd_sample_configs-latest/ovs_stats.conf | 23 + .../pcie_errors.conf | 21 + .../collectd_sample_configs-latest/prometheus.conf | 19 + .../collectd_sample_configs-latest/rdt.conf | 20 + .../collectd_sample_configs-latest/snmp_agent.conf | 785 +++++++++++++++++++++ .../collectd_sample_configs-latest/virt.conf | 30 + .../write_notification.sh | 20 + .../collectd_sample_configs-master/csv.conf | 19 - .../default_plugins.conf | 31 - .../collectd_sample_configs-master/dpdkevents.conf | 35 - .../collectd_sample_configs-master/dpdkstat.conf | 23 - .../collectd_sample_configs-master/exec.conf | 20 - .../collectd_sample_configs-master/hugepages.conf | 22 - .../collectd_sample_configs-master/intel_pmu.conf | 23 - .../collectd_sample_configs-master/kafka.conf | 21 - .../collectd_sample_configs-master/mcelog.conf | 24 - .../collectd_sample_configs-master/network.conf | 18 - .../collectd_sample_configs-master/ovs_events.conf | 24 - .../ovs_pmd_stats.sh | 16 - .../collectd_sample_configs-master/ovs_stats.conf | 23 - .../pcie_errors.conf | 21 - .../collectd_sample_configs-master/prometheus.conf | 19 - .../collectd_sample_configs-master/rdt.conf | 20 - .../collectd_sample_configs-master/snmp_agent.conf | 785 --------------------- .../collectd_sample_configs-master/virt.conf | 30 - .../write_notification.sh | 20 - src/package-list.mk | 6 +- 45 files changed, 1287 insertions(+), 1291 deletions(-) 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 create mode 100644 src/collectd/collectd_sample_configs-latest/csv.conf create mode 100644 src/collectd/collectd_sample_configs-latest/default_plugins.conf create mode 100644 src/collectd/collectd_sample_configs-latest/dpdkevents.conf create mode 100644 src/collectd/collectd_sample_configs-latest/dpdkstat.conf create mode 100644 src/collectd/collectd_sample_configs-latest/exec.conf create mode 100644 src/collectd/collectd_sample_configs-latest/hugepages.conf create mode 100644 src/collectd/collectd_sample_configs-latest/intel_pmu.conf create mode 100644 src/collectd/collectd_sample_configs-latest/kafka.conf create mode 100644 src/collectd/collectd_sample_configs-latest/mcelog.conf create mode 100644 src/collectd/collectd_sample_configs-latest/network.conf create mode 100644 src/collectd/collectd_sample_configs-latest/ovs_events.conf create mode 100755 src/collectd/collectd_sample_configs-latest/ovs_pmd_stats.sh create mode 100644 src/collectd/collectd_sample_configs-latest/ovs_stats.conf create mode 100644 src/collectd/collectd_sample_configs-latest/pcie_errors.conf create mode 100644 src/collectd/collectd_sample_configs-latest/prometheus.conf create mode 100644 src/collectd/collectd_sample_configs-latest/rdt.conf create mode 100644 src/collectd/collectd_sample_configs-latest/snmp_agent.conf create mode 100644 src/collectd/collectd_sample_configs-latest/virt.conf create mode 100755 src/collectd/collectd_sample_configs-latest/write_notification.sh delete mode 100644 src/collectd/collectd_sample_configs-master/csv.conf delete mode 100644 src/collectd/collectd_sample_configs-master/default_plugins.conf delete mode 100644 src/collectd/collectd_sample_configs-master/dpdkevents.conf delete mode 100644 src/collectd/collectd_sample_configs-master/dpdkstat.conf delete mode 100644 src/collectd/collectd_sample_configs-master/exec.conf delete mode 100644 src/collectd/collectd_sample_configs-master/hugepages.conf delete mode 100644 src/collectd/collectd_sample_configs-master/intel_pmu.conf delete mode 100644 src/collectd/collectd_sample_configs-master/kafka.conf delete mode 100644 src/collectd/collectd_sample_configs-master/mcelog.conf delete mode 100644 src/collectd/collectd_sample_configs-master/network.conf delete mode 100644 src/collectd/collectd_sample_configs-master/ovs_events.conf delete mode 100755 src/collectd/collectd_sample_configs-master/ovs_pmd_stats.sh delete mode 100644 src/collectd/collectd_sample_configs-master/ovs_stats.conf delete mode 100644 src/collectd/collectd_sample_configs-master/pcie_errors.conf delete mode 100644 src/collectd/collectd_sample_configs-master/prometheus.conf delete mode 100644 src/collectd/collectd_sample_configs-master/rdt.conf delete mode 100644 src/collectd/collectd_sample_configs-master/snmp_agent.conf delete mode 100644 src/collectd/collectd_sample_configs-master/virt.conf delete mode 100755 src/collectd/collectd_sample_configs-master/write_notification.sh 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/barometer-collectd-latest/Dockerfile b/docker/barometer-collectd-latest/Dockerfile new file mode 100644 index 00000000..4c01c870 --- /dev/null +++ b/docker/barometer-collectd-latest/Dockerfile @@ -0,0 +1,40 @@ +# 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:8 +RUN dnf update -y && \ + dnf install -y which sudo git && \ + dnf clean all && \ + git config --global http.sslVerify false + +ENV DOCKER y +ENV COLLECTD_FLAVOR latest +ENV WITH_DPDK y +ENV repos_dir /src + +WORKDIR ${repos_dir} +RUN mkdir -p ${repos_dir}/barometer +COPY . ${repos_dir}/barometer + +WORKDIR ${repos_dir}/barometer/systems +RUN sh ./build_base_machine.sh && \ + dnf clean all && rm -rf /var/cache/dnf && \ + useradd -ms /bin/bash collectd_exec && \ + echo "collectd_exec ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers + +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 diff --git a/docs/release/userguide/installguide.docker.rst b/docs/release/userguide/installguide.docker.rst index 4f01630f..2bb79415 100644 --- a/docs/release/userguide/installguide.docker.rst +++ b/docs/release/userguide/installguide.docker.rst @@ -269,7 +269,7 @@ Collectd-barometer flavors Before starting to build and run the Collectd container, understand the available flavors of Collectd containers: * barometer-collectd - stable release, based on collectd 5.11 - * barometer-collectd-master - release based on collectd 'main' branch + * barometer-collectd-latest - release based on collectd 'main' branch * barometer-collectd-experimental - release based on collectd 'main' branch that also includes set of experimental (not yet merged into upstream) pull requests @@ -280,7 +280,7 @@ flavors of Collectd containers: Stable `barometer-collectd` container is intended for work in production environment as it is based on latest collectd official release. -`Barometer-collectd-master` and `barometer-collectd-experimental` containers +`barometer-collectd-latest` and `barometer-collectd-experimental` containers can be used in order to try new collectd features. All flavors are located in `barometer` git repository - respective Dockerfiles are stored in subdirectories of `docker/` directory @@ -291,7 +291,7 @@ are stored in subdirectories of `docker/` directory $ git clone https://gerrit.opnfv.org/gerrit/barometer $ ls barometer/docker|grep collectd barometer-collectd - barometer-collectd-master + barometer-collectd-latest barometer-collectd-experimental .. note:: @@ -338,23 +338,24 @@ Output should contain a barometer-collectd image: hello-world latest 05a3bd381fc2 4 weeks ago 1.84kB .. note:: - If you do not plan to use collectd-master and collectd-experimental barometer - containers, then you can proceed directly to section `Run the collectd stable docker image`_ + If you do not plan to use `barometer-collectd-latest` and + `barometer-collectd-experimental` containers, then you can proceed directly + to section `Run the collectd stable docker image`_ -Build collectd-master container -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Build barometer-collectd-latest container +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. code:: bash $ cd - $ sudo docker build -t opnfv/barometer-collectd-master \ + $ sudo docker build -t opnfv/barometer-collectd-latest \ --build-arg http_proxy=`echo $http_proxy` \ --build-arg https_proxy=`echo $https_proxy` --network=host -f \ - docker/barometer-collectd-master/Dockerfile . + docker/barometer-collectd-latest/Dockerfile . .. note:: - For `barometer-collectd-master` and `barometer-collectd-experimental` containers + For `barometer-collectd-latest` and `barometer-collectd-experimental` containers proxy parameters should be passed only if system is behind an HTTP or HTTPS proxy server (same as for stable collectd container) @@ -370,7 +371,7 @@ Build collectd-experimental container --network=host -f docker/barometer-collectd-experimental/Dockerfile . .. note:: - For `barometer-collectd-master` and `barometer-collectd-experimental` containers + For `barometer-collectd-latest` and `barometer-collectd-experimental` containers proxy parameters should be passed only if system is behind an HTTP or HTTPS proxy server (same as for stable collectd container) @@ -429,26 +430,26 @@ To make some changes when the container is running run: sudo docker exec -ti /bin/bash -Run the barometer-collectd-master docker image +Run the barometer-collectd-latest docker image ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Run command for `barometer-collectd-master` container is very similar to command -used for stable container - the only differences are name of the image -and location of the sample configuration files(as different version of collectd -plugins requiring different configuration files) +Run command for ``barometer-collectd-latest`` container is very similar to +command used for stable container - the only differences are name of the image +and location of the sample configuration files (as different version of +collectd plugins requiring different configuration files) .. code:: bash $ cd $ sudo docker run -ti --net=host -v \ - `pwd`/src/collectd/collectd_sample_configs-master:/opt/collectd/etc/collectd.conf.d \ + `pwd`/src/collectd/collectd_sample_configs-latest:/opt/collectd/etc/collectd.conf.d \ -v /var/run:/var/run -v /tmp:/tmp -v /sys/fs/resctrl:/sys/fs/resctrl \ - --privileged opnfv/barometer-collectd-master + --privileged opnfv/barometer-collectd-latest .. note:: Barometer collectd docker images are sharing some directories with host (e.g. /tmp) therefore only one of collectd barometer flavors can be run - at a time. In other words, if you want to try `barometer-collectd-master` or + at a time. In other words, if you want to try `barometer-collectd-latest` or `barometer-collectd-experimental` image, please stop instance of `barometer-collectd(stable)` image first. @@ -461,29 +462,29 @@ plugins requiring different configuration files) Run the barometer-collectd-experimental docker image ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Barometer-collectd-experimental container shares default configuration files -with 'barometer-collectd-master' equivalent but some of experimental pull +with 'barometer-collectd-latest' equivalent but some of experimental pull requests may require modified configuration. Additional configuration files that are required specifically by experimental container can be found in `docker/barometer-collectd-experimental/experimental-configs/` directory. Content of this directory (all \*.conf files) should be copied to -`src/collectd/collectd_sample_configs-master` directory before first run of +``src/collectd/collectd_sample_configs-latest`` directory before first run of experimental container. .. code:: bash $ cd $ cp docker/barometer-collectd-experimental/experimental-configs/*.conf \ - src/collectd/collectd_sample_configs-master + src/collectd/collectd_sample_configs-latest When configuration files are up to date for experimental container, it can be -launched using following command (almost identical to run-command for 'master' +launched using following command (almost identical to run-command for ``latest`` collectd container) .. code:: bash $ cd $ sudo docker run -ti --net=host -v \ - `pwd`/src/collectd/collectd_sample_configs-master:/opt/collectd/etc/collectd.conf.d \ + `pwd`/src/collectd/collectd_sample_configs-latest:/opt/collectd/etc/collectd.conf.d \ -v /var/run:/var/run -v /tmp:/tmp -v /sys/fs/resctrl:/sys/fs/resctrl --privileged \ opnfv/barometer-collectd-experimental diff --git a/src/collectd/collectd_sample_configs-latest/csv.conf b/src/collectd/collectd_sample_configs-latest/csv.conf new file mode 100644 index 00000000..99a8498d --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/csv.conf @@ -0,0 +1,19 @@ +# Copyright 2017 OPNFV +# +# 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 csv + + DataDir "/tmp/collectd/csv" + StoreRates false + diff --git a/src/collectd/collectd_sample_configs-latest/default_plugins.conf b/src/collectd/collectd_sample_configs-latest/default_plugins.conf new file mode 100644 index 00000000..c96b0076 --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/default_plugins.conf @@ -0,0 +1,31 @@ +# Copyright 2017 OPNFV +# +# 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. +#Hostname "" + +LoadPlugin cpufreq +LoadPlugin disk +LoadPlugin ethstat +LoadPlugin ipc +LoadPlugin ipmi +LoadPlugin load +LoadPlugin memory +LoadPlugin numa +LoadPlugin processes +LoadPlugin df +LoadPlugin turbostat +LoadPlugin uptime +LoadPlugin contextswitch +LoadPlugin irq +LoadPlugin df +LoadPlugin swap diff --git a/src/collectd/collectd_sample_configs-latest/dpdkevents.conf b/src/collectd/collectd_sample_configs-latest/dpdkevents.conf new file mode 100644 index 00000000..fdb6f3db --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/dpdkevents.conf @@ -0,0 +1,35 @@ +# Copyright 2017 OPNFV +# +# 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. + + Interval 1 + + + + +# Coremask "0x1" +# MemoryChannels "4" +# FilePrefix "rte" + + + SendEventsOnUpdate false + EnabledPortMask 0xffff + SendNotification true + + + SendEventsOnUpdate false + LCoreMask "0xf" + KeepAliveShmName "/dpdk_keepalive_shm_name" + SendNotification true + + diff --git a/src/collectd/collectd_sample_configs-latest/dpdkstat.conf b/src/collectd/collectd_sample_configs-latest/dpdkstat.conf new file mode 100644 index 00000000..59906d4e --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/dpdkstat.conf @@ -0,0 +1,23 @@ +# Copyright 2017 OPNFV +# +# 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 dpdkstat + + +# Coremask "0xf" +# ProcessType "secondary" +# FilePrefix "rte" + EnabledPortMask 0xffff +# PortName "interface1" +# PortName "interface2" + diff --git a/src/collectd/collectd_sample_configs-latest/exec.conf b/src/collectd/collectd_sample_configs-latest/exec.conf new file mode 100644 index 00000000..0a291bdb --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/exec.conf @@ -0,0 +1,20 @@ +# Copyright 2017 OPNFV +# +# 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 exec + + + # For OVS PMD stats plugin + Exec "collectd_exec" "/opt/collectd/etc/collectd.conf.d/ovs_pmd_stats.sh" + NotificationExec "collectd_exec" "/opt/collectd/etc/collectd.conf.d/write_notification.sh" + diff --git a/src/collectd/collectd_sample_configs-latest/hugepages.conf b/src/collectd/collectd_sample_configs-latest/hugepages.conf new file mode 100644 index 00000000..97cd2d17 --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/hugepages.conf @@ -0,0 +1,22 @@ +# Copyright 2017 OPNFV +# +# 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 hugepages + + + ReportPerNodeHP true + ReportRootHP true + ValuesPages true + ValuesBytes false + ValuesPercentage false + diff --git a/src/collectd/collectd_sample_configs-latest/intel_pmu.conf b/src/collectd/collectd_sample_configs-latest/intel_pmu.conf new file mode 100644 index 00000000..959fb8a1 --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/intel_pmu.conf @@ -0,0 +1,23 @@ +# Copyright 2017 OPNFV +# +# 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 intel_pmu + + + ReportHardwareCacheEvents true + ReportKernelPMUEvents true + ReportSoftwareEvents true +# EventList "/var/cache/pmu/GenuineIntel-6-2D-core.json" +# HardwareEvents "L2_RQSTS.CODE_RD_HIT,L2_RQSTS.CODE_RD_MISS" "L2_RQSTS.ALL_CODE_RD" + Cores "[0-4]" + diff --git a/src/collectd/collectd_sample_configs-latest/kafka.conf b/src/collectd/collectd_sample_configs-latest/kafka.conf new file mode 100644 index 00000000..f81e87fd --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/kafka.conf @@ -0,0 +1,21 @@ +# Copyright 2017 OPNFV +# +# 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 write_kafka + + + Property "metadata.broker.list" "localhost:9092" + + Format JSON + + diff --git a/src/collectd/collectd_sample_configs-latest/mcelog.conf b/src/collectd/collectd_sample_configs-latest/mcelog.conf new file mode 100644 index 00000000..633a3bcd --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/mcelog.conf @@ -0,0 +1,24 @@ +# Copyright 2017 OPNFV +# +# 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. + + Interval 1 + + + + + McelogClientSocket "/var/run/mcelog-client" + PersistentNotification false + +## McelogLogfile "/var/log/mcelog" + diff --git a/src/collectd/collectd_sample_configs-latest/network.conf b/src/collectd/collectd_sample_configs-latest/network.conf new file mode 100644 index 00000000..4309ed86 --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/network.conf @@ -0,0 +1,18 @@ +# Copyright 2017 OPNFV +# +# 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 network + + Server "127.0.0.1" "25826" + diff --git a/src/collectd/collectd_sample_configs-latest/ovs_events.conf b/src/collectd/collectd_sample_configs-latest/ovs_events.conf new file mode 100644 index 00000000..250e1e43 --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/ovs_events.conf @@ -0,0 +1,24 @@ +# Copyright 2017 OPNFV +# +# 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. + + Interval 1 + + + +# Port "6640" +# Address "127.0.0.1" +# Socket "/var/run/openvswitch/db.sock" +# Interfaces "br0" "veth0" + SendNotification true + diff --git a/src/collectd/collectd_sample_configs-latest/ovs_pmd_stats.sh b/src/collectd/collectd_sample_configs-latest/ovs_pmd_stats.sh new file mode 100755 index 00000000..78e72047 --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/ovs_pmd_stats.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# 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. +# +sudo python /usr/local/src/ovs_pmd_stats.py --socket-pid-file /var/run/openvswitch/ovs-vswitchd.pid diff --git a/src/collectd/collectd_sample_configs-latest/ovs_stats.conf b/src/collectd/collectd_sample_configs-latest/ovs_stats.conf new file mode 100644 index 00000000..2a6d2fb2 --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/ovs_stats.conf @@ -0,0 +1,23 @@ +# Copyright 2017 OPNFV +# +# 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 + + + Interval 1 + + +# Port "6640" +# Address "127.0.0.1" +# Socket "/var/run/openvswitch/db.sock" +# Bridges "br0" + diff --git a/src/collectd/collectd_sample_configs-latest/pcie_errors.conf b/src/collectd/collectd_sample_configs-latest/pcie_errors.conf new file mode 100644 index 00000000..de9b7533 --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/pcie_errors.conf @@ -0,0 +1,21 @@ +# Copyright 2019 OPNFV +# +# 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. + + + Interval 0.01 + + + + PersistentNotifications false + diff --git a/src/collectd/collectd_sample_configs-latest/prometheus.conf b/src/collectd/collectd_sample_configs-latest/prometheus.conf new file mode 100644 index 00000000..13ef328e --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/prometheus.conf @@ -0,0 +1,19 @@ +#Copyright 2019 OPNFV +# +# 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 write_prometheus + + + Port "9103" + diff --git a/src/collectd/collectd_sample_configs-latest/rdt.conf b/src/collectd/collectd_sample_configs-latest/rdt.conf new file mode 100644 index 00000000..ae983dc0 --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/rdt.conf @@ -0,0 +1,20 @@ +# Copyright 2017 OPNFV +# +# 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. + + Interval 1 + + + + Cores "" + diff --git a/src/collectd/collectd_sample_configs-latest/snmp_agent.conf b/src/collectd/collectd_sample_configs-latest/snmp_agent.conf new file mode 100644 index 00000000..7cbde816 --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/snmp_agent.conf @@ -0,0 +1,785 @@ +# Copyright 2017 OPNFV +# +# 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" + +
+ # Libvirt MIB + + + + Source "PluginInstance" + + Plugin "virt" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhDomainName" + + + Plugin "virt" + Type "ps_cputime" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhCPUTotalTimeUser" "LIBVIRT-HYPERVISOR-MIB::lvhCPUTotalTimeSystem" + + + Plugin "virt" + Type "percent" + TypeInstance "virt_cpu_total" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhVirtCPUTotal" + + + Plugin "virt" + Type "memory" + TypeInstance "total" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemoryTotal" + +
+ + + + Source "PluginInstance" + + Plugin "virt" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemoryDomainName" + + + Plugin "virt" + Type "memory" + TypeInstance "swap_in" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemorySwapIn" + + + Plugin "virt" + Type "memory" + TypeInstance "swap_out" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemorySwapOut" + + + Plugin "virt" + Type "memory" + TypeInstance "major_fault" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemoryMajorFault" + + + Plugin "virt" + Type "memory" + TypeInstance "minor_fault" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemoryMinorFault" + + + Plugin "virt" + Type "memory" + TypeInstance "unused" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemoryUnused" + + + Plugin "virt" + Type "memory" + TypeInstance "available" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemoryAvailable" + + + Plugin "virt" + Type "memory" + TypeInstance "actual_balloon" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemoryActualBalloon" + + + Plugin "virt" + Type "memory" + TypeInstance "rss" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemoryRss" + + + Plugin "virt" + Type "memory" + TypeInstance "last_update" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemoryLastUpdate" + +
+ + + + Source "PluginInstance" + + Plugin "virt" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfDomainName" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_alignment_faults" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfAlignmentFaults" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_branch_instructions" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfBranchInstructions" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_branch_misses" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfBranchMisses" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_bus_cycles" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfBusCycles" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_cache_misses" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfCacheMisses" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_cache_references" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfCacheReferences" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_cmt" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfCmt" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_context_switches" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfContextSwitches" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_cpu_clock" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfCPUClock" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_cpu_cycles" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfCPUCycles" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_cpu_migrations" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfCPUMigrations" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_emulation_faults" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfEmulationFaults" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_instructions" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfInstructions" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_mbml" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfMbml" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_mbmt" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfMbmt" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_page_faults" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfPageFaults" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_page_faults_maj" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfPageFaultsMaj" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_page_faults_min" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfPageFaultsMin" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_ref_cpu_cycles" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfRefCPUCycles" + + + Plugin "virt" + Type "perf" + TypeInstance "perf_task_clock" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfTaskClock" + +
+ + + + Source "PluginInstance" + + Plugin "virt" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhAffinityDomainName" + + + Plugin "virt" + + Source "TypeInstance" + Regex "^vcpu_([0-9]{1,3})-cpu_[0-9]{1,3}$" + Group 1 + + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhVCPUIndex" + + + Plugin "virt" + + Source "TypeInstance" + Regex "^vcpu_[0-9]{1,3}-cpu_([0-9]{1,3})$" + Group 1 + + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhCPUIndex" + + + Plugin "virt" + Type "cpu_affinity" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhCPUAffinity" + +
+ + + + Source "PluginInstance" + + Plugin "virt" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhVCPUDomainName" + + + + Source "TypeInstance" + Regex "^([0-9]{1,3})$" + Group 1 + + Plugin "virt" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhVCPUVCPUIndex" + + + Plugin "virt" + Type "virt_vcpu" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhVirtVCPU" + +
+ + + + Source "PluginInstance" + + Plugin "virt" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhDiskDomainName" + + + + Source "TypeInstance" + + Plugin "virt" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhDiskName" + + + Plugin "virt" + Type "disk_error" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhDiskError" + +
+ + + + Source "PluginInstance" + + Plugin "virt" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhBlockDomainName" + + + + Source "TypeInstance" + + Plugin "virt" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhBlockDeviceName" + + + Plugin "virt" + Type "disk_ops" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhDiskOpsRead" "LIBVIRT-HYPERVISOR-MIB::lvhDiskOpsWrite" + + + Plugin "virt" + Type "disk_octets" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhDiskOctetsRead" "LIBVIRT-HYPERVISOR-MIB::lvhDiskOctetsWrite" + + + Plugin "virt" + Type "disk_time" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhDiskTimeCacheRead" "LIBVIRT-HYPERVISOR-MIB::lvhDiskTimeCacheWrite" + +
+ + + + Source "PluginInstance" + + Plugin "virt" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhBlockDevFlushDomainName" + + + + Source "TypeInstance" + Regex "^flush-(.*)$" + Group 1 + + Plugin "virt" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhBlockDevFlushDeviceName" + + + Plugin "virt" + Type "total_requests" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhTotalRequestsFlush" + + + Plugin "virt" + Type "total_time_in_ms" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhTotalTimeInMsFlush" + +
+ + + + Source "PluginInstance" + + Plugin "virt" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhNetIfDomainName" + + + + Source "TypeInstance" + + Plugin "virt" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhInterfaceName" + + + Plugin "virt" + Type "if_octets" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhIfBytesReceived" "LIBVIRT-HYPERVISOR-MIB::lvhIfBytesTransmitted" + + + Plugin "virt" + Type "if_packets" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhIfPacketsReceived" "LIBVIRT-HYPERVISOR-MIB::lvhIfPacketsTransmitted" + + + Plugin "virt" + Type "if_errors" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhIfErrorsReceive" "LIBVIRT-HYPERVISOR-MIB::lvhIfErrorsTransmission" + + + Plugin "virt" + Type "if_dropped" + OIDs "LIBVIRT-HYPERVISOR-MIB::lvhIfDroppedReceive" "LIBVIRT-HYPERVISOR-MIB::lvhIfDroppedTransmit" + +
+ diff --git a/src/collectd/collectd_sample_configs-latest/virt.conf b/src/collectd/collectd_sample_configs-latest/virt.conf new file mode 100644 index 00000000..88229e3c --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/virt.conf @@ -0,0 +1,30 @@ +# Copyright 2017 OPNFV +# +# 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 virt + +# Connection "xen:///" + RefreshInterval 60 +# Domain "name" +# BlockDevice "name:device" +# BlockDeviceFormat target +# BlockDeviceFormatBasename false +# InterfaceDevice "name:device" +# IgnoreSelected false +# HostnameFormat name +# InterfaceFormat name +# PluginInstanceFormat name +# Instances 1 + ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin" + diff --git a/src/collectd/collectd_sample_configs-latest/write_notification.sh b/src/collectd/collectd_sample_configs-latest/write_notification.sh new file mode 100755 index 00000000..47ae9a83 --- /dev/null +++ b/src/collectd/collectd_sample_configs-latest/write_notification.sh @@ -0,0 +1,20 @@ +#!/bin/bash +# 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. +# +rm -f /tmp/notifications +while read x y +do + echo $x$y >> /tmp/notifications +done diff --git a/src/collectd/collectd_sample_configs-master/csv.conf b/src/collectd/collectd_sample_configs-master/csv.conf deleted file mode 100644 index 99a8498d..00000000 --- a/src/collectd/collectd_sample_configs-master/csv.conf +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2017 OPNFV -# -# 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 csv - - DataDir "/tmp/collectd/csv" - StoreRates false - diff --git a/src/collectd/collectd_sample_configs-master/default_plugins.conf b/src/collectd/collectd_sample_configs-master/default_plugins.conf deleted file mode 100644 index c96b0076..00000000 --- a/src/collectd/collectd_sample_configs-master/default_plugins.conf +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2017 OPNFV -# -# 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. -#Hostname "" - -LoadPlugin cpufreq -LoadPlugin disk -LoadPlugin ethstat -LoadPlugin ipc -LoadPlugin ipmi -LoadPlugin load -LoadPlugin memory -LoadPlugin numa -LoadPlugin processes -LoadPlugin df -LoadPlugin turbostat -LoadPlugin uptime -LoadPlugin contextswitch -LoadPlugin irq -LoadPlugin df -LoadPlugin swap diff --git a/src/collectd/collectd_sample_configs-master/dpdkevents.conf b/src/collectd/collectd_sample_configs-master/dpdkevents.conf deleted file mode 100644 index fdb6f3db..00000000 --- a/src/collectd/collectd_sample_configs-master/dpdkevents.conf +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2017 OPNFV -# -# 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. - - Interval 1 - - - - -# Coremask "0x1" -# MemoryChannels "4" -# FilePrefix "rte" - - - SendEventsOnUpdate false - EnabledPortMask 0xffff - SendNotification true - - - SendEventsOnUpdate false - LCoreMask "0xf" - KeepAliveShmName "/dpdk_keepalive_shm_name" - SendNotification true - - diff --git a/src/collectd/collectd_sample_configs-master/dpdkstat.conf b/src/collectd/collectd_sample_configs-master/dpdkstat.conf deleted file mode 100644 index 59906d4e..00000000 --- a/src/collectd/collectd_sample_configs-master/dpdkstat.conf +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2017 OPNFV -# -# 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 dpdkstat - - -# Coremask "0xf" -# ProcessType "secondary" -# FilePrefix "rte" - EnabledPortMask 0xffff -# PortName "interface1" -# PortName "interface2" - diff --git a/src/collectd/collectd_sample_configs-master/exec.conf b/src/collectd/collectd_sample_configs-master/exec.conf deleted file mode 100644 index 0a291bdb..00000000 --- a/src/collectd/collectd_sample_configs-master/exec.conf +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2017 OPNFV -# -# 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 exec - - - # For OVS PMD stats plugin - Exec "collectd_exec" "/opt/collectd/etc/collectd.conf.d/ovs_pmd_stats.sh" - NotificationExec "collectd_exec" "/opt/collectd/etc/collectd.conf.d/write_notification.sh" - diff --git a/src/collectd/collectd_sample_configs-master/hugepages.conf b/src/collectd/collectd_sample_configs-master/hugepages.conf deleted file mode 100644 index 97cd2d17..00000000 --- a/src/collectd/collectd_sample_configs-master/hugepages.conf +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 2017 OPNFV -# -# 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 hugepages - - - ReportPerNodeHP true - ReportRootHP true - ValuesPages true - ValuesBytes false - ValuesPercentage false - diff --git a/src/collectd/collectd_sample_configs-master/intel_pmu.conf b/src/collectd/collectd_sample_configs-master/intel_pmu.conf deleted file mode 100644 index 959fb8a1..00000000 --- a/src/collectd/collectd_sample_configs-master/intel_pmu.conf +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2017 OPNFV -# -# 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 intel_pmu - - - ReportHardwareCacheEvents true - ReportKernelPMUEvents true - ReportSoftwareEvents true -# EventList "/var/cache/pmu/GenuineIntel-6-2D-core.json" -# HardwareEvents "L2_RQSTS.CODE_RD_HIT,L2_RQSTS.CODE_RD_MISS" "L2_RQSTS.ALL_CODE_RD" - Cores "[0-4]" - diff --git a/src/collectd/collectd_sample_configs-master/kafka.conf b/src/collectd/collectd_sample_configs-master/kafka.conf deleted file mode 100644 index f81e87fd..00000000 --- a/src/collectd/collectd_sample_configs-master/kafka.conf +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2017 OPNFV -# -# 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 write_kafka - - - Property "metadata.broker.list" "localhost:9092" - - Format JSON - - diff --git a/src/collectd/collectd_sample_configs-master/mcelog.conf b/src/collectd/collectd_sample_configs-master/mcelog.conf deleted file mode 100644 index 633a3bcd..00000000 --- a/src/collectd/collectd_sample_configs-master/mcelog.conf +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2017 OPNFV -# -# 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. - - Interval 1 - - - - - McelogClientSocket "/var/run/mcelog-client" - PersistentNotification false - -## McelogLogfile "/var/log/mcelog" - diff --git a/src/collectd/collectd_sample_configs-master/network.conf b/src/collectd/collectd_sample_configs-master/network.conf deleted file mode 100644 index 4309ed86..00000000 --- a/src/collectd/collectd_sample_configs-master/network.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2017 OPNFV -# -# 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 network - - Server "127.0.0.1" "25826" - diff --git a/src/collectd/collectd_sample_configs-master/ovs_events.conf b/src/collectd/collectd_sample_configs-master/ovs_events.conf deleted file mode 100644 index 250e1e43..00000000 --- a/src/collectd/collectd_sample_configs-master/ovs_events.conf +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2017 OPNFV -# -# 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. - - Interval 1 - - - -# Port "6640" -# Address "127.0.0.1" -# Socket "/var/run/openvswitch/db.sock" -# Interfaces "br0" "veth0" - SendNotification true - diff --git a/src/collectd/collectd_sample_configs-master/ovs_pmd_stats.sh b/src/collectd/collectd_sample_configs-master/ovs_pmd_stats.sh deleted file mode 100755 index 78e72047..00000000 --- a/src/collectd/collectd_sample_configs-master/ovs_pmd_stats.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -# 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. -# -sudo python /usr/local/src/ovs_pmd_stats.py --socket-pid-file /var/run/openvswitch/ovs-vswitchd.pid diff --git a/src/collectd/collectd_sample_configs-master/ovs_stats.conf b/src/collectd/collectd_sample_configs-master/ovs_stats.conf deleted file mode 100644 index 2a6d2fb2..00000000 --- a/src/collectd/collectd_sample_configs-master/ovs_stats.conf +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2017 OPNFV -# -# 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 - - - Interval 1 - - -# Port "6640" -# Address "127.0.0.1" -# Socket "/var/run/openvswitch/db.sock" -# Bridges "br0" - diff --git a/src/collectd/collectd_sample_configs-master/pcie_errors.conf b/src/collectd/collectd_sample_configs-master/pcie_errors.conf deleted file mode 100644 index de9b7533..00000000 --- a/src/collectd/collectd_sample_configs-master/pcie_errors.conf +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2019 OPNFV -# -# 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. - - - Interval 0.01 - - - - PersistentNotifications false - diff --git a/src/collectd/collectd_sample_configs-master/prometheus.conf b/src/collectd/collectd_sample_configs-master/prometheus.conf deleted file mode 100644 index 13ef328e..00000000 --- a/src/collectd/collectd_sample_configs-master/prometheus.conf +++ /dev/null @@ -1,19 +0,0 @@ -#Copyright 2019 OPNFV -# -# 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 write_prometheus - - - Port "9103" - diff --git a/src/collectd/collectd_sample_configs-master/rdt.conf b/src/collectd/collectd_sample_configs-master/rdt.conf deleted file mode 100644 index ae983dc0..00000000 --- a/src/collectd/collectd_sample_configs-master/rdt.conf +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2017 OPNFV -# -# 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. - - Interval 1 - - - - Cores "" - diff --git a/src/collectd/collectd_sample_configs-master/snmp_agent.conf b/src/collectd/collectd_sample_configs-master/snmp_agent.conf deleted file mode 100644 index 7cbde816..00000000 --- a/src/collectd/collectd_sample_configs-master/snmp_agent.conf +++ /dev/null @@ -1,785 +0,0 @@ -# Copyright 2017 OPNFV -# -# 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" - -
- # Libvirt MIB - - - - Source "PluginInstance" - - Plugin "virt" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhDomainName" - - - Plugin "virt" - Type "ps_cputime" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhCPUTotalTimeUser" "LIBVIRT-HYPERVISOR-MIB::lvhCPUTotalTimeSystem" - - - Plugin "virt" - Type "percent" - TypeInstance "virt_cpu_total" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhVirtCPUTotal" - - - Plugin "virt" - Type "memory" - TypeInstance "total" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemoryTotal" - -
- - - - Source "PluginInstance" - - Plugin "virt" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemoryDomainName" - - - Plugin "virt" - Type "memory" - TypeInstance "swap_in" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemorySwapIn" - - - Plugin "virt" - Type "memory" - TypeInstance "swap_out" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemorySwapOut" - - - Plugin "virt" - Type "memory" - TypeInstance "major_fault" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemoryMajorFault" - - - Plugin "virt" - Type "memory" - TypeInstance "minor_fault" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemoryMinorFault" - - - Plugin "virt" - Type "memory" - TypeInstance "unused" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemoryUnused" - - - Plugin "virt" - Type "memory" - TypeInstance "available" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemoryAvailable" - - - Plugin "virt" - Type "memory" - TypeInstance "actual_balloon" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemoryActualBalloon" - - - Plugin "virt" - Type "memory" - TypeInstance "rss" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemoryRss" - - - Plugin "virt" - Type "memory" - TypeInstance "last_update" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhMemoryLastUpdate" - -
- - - - Source "PluginInstance" - - Plugin "virt" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfDomainName" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_alignment_faults" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfAlignmentFaults" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_branch_instructions" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfBranchInstructions" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_branch_misses" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfBranchMisses" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_bus_cycles" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfBusCycles" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_cache_misses" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfCacheMisses" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_cache_references" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfCacheReferences" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_cmt" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfCmt" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_context_switches" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfContextSwitches" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_cpu_clock" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfCPUClock" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_cpu_cycles" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfCPUCycles" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_cpu_migrations" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfCPUMigrations" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_emulation_faults" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfEmulationFaults" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_instructions" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfInstructions" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_mbml" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfMbml" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_mbmt" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfMbmt" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_page_faults" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfPageFaults" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_page_faults_maj" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfPageFaultsMaj" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_page_faults_min" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfPageFaultsMin" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_ref_cpu_cycles" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfRefCPUCycles" - - - Plugin "virt" - Type "perf" - TypeInstance "perf_task_clock" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhPerfTaskClock" - -
- - - - Source "PluginInstance" - - Plugin "virt" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhAffinityDomainName" - - - Plugin "virt" - - Source "TypeInstance" - Regex "^vcpu_([0-9]{1,3})-cpu_[0-9]{1,3}$" - Group 1 - - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhVCPUIndex" - - - Plugin "virt" - - Source "TypeInstance" - Regex "^vcpu_[0-9]{1,3}-cpu_([0-9]{1,3})$" - Group 1 - - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhCPUIndex" - - - Plugin "virt" - Type "cpu_affinity" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhCPUAffinity" - -
- - - - Source "PluginInstance" - - Plugin "virt" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhVCPUDomainName" - - - - Source "TypeInstance" - Regex "^([0-9]{1,3})$" - Group 1 - - Plugin "virt" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhVCPUVCPUIndex" - - - Plugin "virt" - Type "virt_vcpu" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhVirtVCPU" - -
- - - - Source "PluginInstance" - - Plugin "virt" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhDiskDomainName" - - - - Source "TypeInstance" - - Plugin "virt" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhDiskName" - - - Plugin "virt" - Type "disk_error" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhDiskError" - -
- - - - Source "PluginInstance" - - Plugin "virt" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhBlockDomainName" - - - - Source "TypeInstance" - - Plugin "virt" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhBlockDeviceName" - - - Plugin "virt" - Type "disk_ops" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhDiskOpsRead" "LIBVIRT-HYPERVISOR-MIB::lvhDiskOpsWrite" - - - Plugin "virt" - Type "disk_octets" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhDiskOctetsRead" "LIBVIRT-HYPERVISOR-MIB::lvhDiskOctetsWrite" - - - Plugin "virt" - Type "disk_time" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhDiskTimeCacheRead" "LIBVIRT-HYPERVISOR-MIB::lvhDiskTimeCacheWrite" - -
- - - - Source "PluginInstance" - - Plugin "virt" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhBlockDevFlushDomainName" - - - - Source "TypeInstance" - Regex "^flush-(.*)$" - Group 1 - - Plugin "virt" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhBlockDevFlushDeviceName" - - - Plugin "virt" - Type "total_requests" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhTotalRequestsFlush" - - - Plugin "virt" - Type "total_time_in_ms" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhTotalTimeInMsFlush" - -
- - - - Source "PluginInstance" - - Plugin "virt" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhNetIfDomainName" - - - - Source "TypeInstance" - - Plugin "virt" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhInterfaceName" - - - Plugin "virt" - Type "if_octets" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhIfBytesReceived" "LIBVIRT-HYPERVISOR-MIB::lvhIfBytesTransmitted" - - - Plugin "virt" - Type "if_packets" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhIfPacketsReceived" "LIBVIRT-HYPERVISOR-MIB::lvhIfPacketsTransmitted" - - - Plugin "virt" - Type "if_errors" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhIfErrorsReceive" "LIBVIRT-HYPERVISOR-MIB::lvhIfErrorsTransmission" - - - Plugin "virt" - Type "if_dropped" - OIDs "LIBVIRT-HYPERVISOR-MIB::lvhIfDroppedReceive" "LIBVIRT-HYPERVISOR-MIB::lvhIfDroppedTransmit" - -
- diff --git a/src/collectd/collectd_sample_configs-master/virt.conf b/src/collectd/collectd_sample_configs-master/virt.conf deleted file mode 100644 index 88229e3c..00000000 --- a/src/collectd/collectd_sample_configs-master/virt.conf +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2017 OPNFV -# -# 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 virt - -# Connection "xen:///" - RefreshInterval 60 -# Domain "name" -# BlockDevice "name:device" -# BlockDeviceFormat target -# BlockDeviceFormatBasename false -# InterfaceDevice "name:device" -# IgnoreSelected false -# HostnameFormat name -# InterfaceFormat name -# PluginInstanceFormat name -# Instances 1 - ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin" - diff --git a/src/collectd/collectd_sample_configs-master/write_notification.sh b/src/collectd/collectd_sample_configs-master/write_notification.sh deleted file mode 100755 index 47ae9a83..00000000 --- a/src/collectd/collectd_sample_configs-master/write_notification.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# 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. -# -rm -f /tmp/notifications -while read x y -do - echo $x$y >> /tmp/notifications -done diff --git a/src/package-list.mk b/src/package-list.mk index ec64df14..59e9a0a2 100644 --- a/src/package-list.mk +++ b/src/package-list.mk @@ -22,7 +22,7 @@ COLLECTD_URL ?= https://github.com/collectd/collectd # there are 3 collectd flavors: # -"stable" - based on stable collectd release -# -"master" - development version, based on main branch +# -"latest" - development version, based on main branch # -"experimental" - it is based on main branch as above and includes # set pull requests with experimental features ifeq ($(COLLECTD_FLAVOR), stable) @@ -30,10 +30,10 @@ ifeq ($(COLLECTD_FLAVOR), stable) COLLECTD_TAG ?= collectd-5.12 SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs else -# 'master' and 'experimental' collectd flavors are both using +# 'latest' and 'experimental' collectd flavors are both using # code from main branch COLLECTD_TAG ?= main - SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs-master + SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs-latest ifeq ($(COLLECTD_FLAVOR), experimental) # 'experimental' flavor is using additional Pull Requests that # are put on top of main release -- cgit 1.2.3-korg