aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmma Foley <efoley@redhat.com>2020-11-17 13:58:22 +0000
committerEmma Foley <efoley@redhat.com>2020-11-19 13:41:50 +0000
commit5560c122f820a8a5ecabc4c24a6e9fd444163910 (patch)
treeb40a3c4d4b87dfae03e7f9f34560015dd8676a64 /src
parent2847e052aef84d97b674aee3a655c55091844925 (diff)
[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 <efoley@redhat.com> Change-Id: I4ee91c289b9e7477157bea148452be58343dc733
Diffstat (limited to 'src')
-rw-r--r--src/collectd/collectd_sample_configs-latest/csv.conf (renamed from src/collectd/collectd_sample_configs-master/csv.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-latest/default_plugins.conf (renamed from src/collectd/collectd_sample_configs-master/default_plugins.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-latest/dpdkevents.conf (renamed from src/collectd/collectd_sample_configs-master/dpdkevents.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-latest/dpdkstat.conf (renamed from src/collectd/collectd_sample_configs-master/dpdkstat.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-latest/exec.conf (renamed from src/collectd/collectd_sample_configs-master/exec.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-latest/hugepages.conf (renamed from src/collectd/collectd_sample_configs-master/hugepages.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-latest/intel_pmu.conf (renamed from src/collectd/collectd_sample_configs-master/intel_pmu.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-latest/kafka.conf (renamed from src/collectd/collectd_sample_configs-master/kafka.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-latest/mcelog.conf (renamed from src/collectd/collectd_sample_configs-master/mcelog.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-latest/network.conf (renamed from src/collectd/collectd_sample_configs-master/network.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-latest/ovs_events.conf (renamed from src/collectd/collectd_sample_configs-master/ovs_events.conf)0
-rwxr-xr-xsrc/collectd/collectd_sample_configs-latest/ovs_pmd_stats.sh (renamed from src/collectd/collectd_sample_configs-master/ovs_pmd_stats.sh)0
-rw-r--r--src/collectd/collectd_sample_configs-latest/ovs_stats.conf (renamed from src/collectd/collectd_sample_configs-master/ovs_stats.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-latest/pcie_errors.conf (renamed from src/collectd/collectd_sample_configs-master/pcie_errors.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-latest/prometheus.conf (renamed from src/collectd/collectd_sample_configs-master/prometheus.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-latest/rdt.conf (renamed from src/collectd/collectd_sample_configs-master/rdt.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-latest/snmp_agent.conf (renamed from src/collectd/collectd_sample_configs-master/snmp_agent.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-latest/virt.conf (renamed from src/collectd/collectd_sample_configs-master/virt.conf)0
-rwxr-xr-xsrc/collectd/collectd_sample_configs-latest/write_notification.sh (renamed from src/collectd/collectd_sample_configs-master/write_notification.sh)0
-rw-r--r--src/package-list.mk6
20 files changed, 3 insertions, 3 deletions
diff --git a/src/collectd/collectd_sample_configs-master/csv.conf b/src/collectd/collectd_sample_configs-latest/csv.conf
index 99a8498d..99a8498d 100644
--- a/src/collectd/collectd_sample_configs-master/csv.conf
+++ b/src/collectd/collectd_sample_configs-latest/csv.conf
diff --git a/src/collectd/collectd_sample_configs-master/default_plugins.conf b/src/collectd/collectd_sample_configs-latest/default_plugins.conf
index c96b0076..c96b0076 100644
--- a/src/collectd/collectd_sample_configs-master/default_plugins.conf
+++ b/src/collectd/collectd_sample_configs-latest/default_plugins.conf
diff --git a/src/collectd/collectd_sample_configs-master/dpdkevents.conf b/src/collectd/collectd_sample_configs-latest/dpdkevents.conf
index fdb6f3db..fdb6f3db 100644
--- a/src/collectd/collectd_sample_configs-master/dpdkevents.conf
+++ b/src/collectd/collectd_sample_configs-latest/dpdkevents.conf
diff --git a/src/collectd/collectd_sample_configs-master/dpdkstat.conf b/src/collectd/collectd_sample_configs-latest/dpdkstat.conf
index 59906d4e..59906d4e 100644
--- a/src/collectd/collectd_sample_configs-master/dpdkstat.conf
+++ b/src/collectd/collectd_sample_configs-latest/dpdkstat.conf
diff --git a/src/collectd/collectd_sample_configs-master/exec.conf b/src/collectd/collectd_sample_configs-latest/exec.conf
index 0a291bdb..0a291bdb 100644
--- a/src/collectd/collectd_sample_configs-master/exec.conf
+++ b/src/collectd/collectd_sample_configs-latest/exec.conf
diff --git a/src/collectd/collectd_sample_configs-master/hugepages.conf b/src/collectd/collectd_sample_configs-latest/hugepages.conf
index 97cd2d17..97cd2d17 100644
--- a/src/collectd/collectd_sample_configs-master/hugepages.conf
+++ b/src/collectd/collectd_sample_configs-latest/hugepages.conf
diff --git a/src/collectd/collectd_sample_configs-master/intel_pmu.conf b/src/collectd/collectd_sample_configs-latest/intel_pmu.conf
index 959fb8a1..959fb8a1 100644
--- a/src/collectd/collectd_sample_configs-master/intel_pmu.conf
+++ b/src/collectd/collectd_sample_configs-latest/intel_pmu.conf
diff --git a/src/collectd/collectd_sample_configs-master/kafka.conf b/src/collectd/collectd_sample_configs-latest/kafka.conf
index f81e87fd..f81e87fd 100644
--- a/src/collectd/collectd_sample_configs-master/kafka.conf
+++ b/src/collectd/collectd_sample_configs-latest/kafka.conf
diff --git a/src/collectd/collectd_sample_configs-master/mcelog.conf b/src/collectd/collectd_sample_configs-latest/mcelog.conf
index 633a3bcd..633a3bcd 100644
--- a/src/collectd/collectd_sample_configs-master/mcelog.conf
+++ b/src/collectd/collectd_sample_configs-latest/mcelog.conf
diff --git a/src/collectd/collectd_sample_configs-master/network.conf b/src/collectd/collectd_sample_configs-latest/network.conf
index 4309ed86..4309ed86 100644
--- a/src/collectd/collectd_sample_configs-master/network.conf
+++ b/src/collectd/collectd_sample_configs-latest/network.conf
diff --git a/src/collectd/collectd_sample_configs-master/ovs_events.conf b/src/collectd/collectd_sample_configs-latest/ovs_events.conf
index 250e1e43..250e1e43 100644
--- a/src/collectd/collectd_sample_configs-master/ovs_events.conf
+++ b/src/collectd/collectd_sample_configs-latest/ovs_events.conf
diff --git a/src/collectd/collectd_sample_configs-master/ovs_pmd_stats.sh b/src/collectd/collectd_sample_configs-latest/ovs_pmd_stats.sh
index 78e72047..78e72047 100755
--- a/src/collectd/collectd_sample_configs-master/ovs_pmd_stats.sh
+++ b/src/collectd/collectd_sample_configs-latest/ovs_pmd_stats.sh
diff --git a/src/collectd/collectd_sample_configs-master/ovs_stats.conf b/src/collectd/collectd_sample_configs-latest/ovs_stats.conf
index 2a6d2fb2..2a6d2fb2 100644
--- a/src/collectd/collectd_sample_configs-master/ovs_stats.conf
+++ b/src/collectd/collectd_sample_configs-latest/ovs_stats.conf
diff --git a/src/collectd/collectd_sample_configs-master/pcie_errors.conf b/src/collectd/collectd_sample_configs-latest/pcie_errors.conf
index de9b7533..de9b7533 100644
--- a/src/collectd/collectd_sample_configs-master/pcie_errors.conf
+++ b/src/collectd/collectd_sample_configs-latest/pcie_errors.conf
diff --git a/src/collectd/collectd_sample_configs-master/prometheus.conf b/src/collectd/collectd_sample_configs-latest/prometheus.conf
index 13ef328e..13ef328e 100644
--- a/src/collectd/collectd_sample_configs-master/prometheus.conf
+++ b/src/collectd/collectd_sample_configs-latest/prometheus.conf
diff --git a/src/collectd/collectd_sample_configs-master/rdt.conf b/src/collectd/collectd_sample_configs-latest/rdt.conf
index ae983dc0..ae983dc0 100644
--- a/src/collectd/collectd_sample_configs-master/rdt.conf
+++ b/src/collectd/collectd_sample_configs-latest/rdt.conf
diff --git a/src/collectd/collectd_sample_configs-master/snmp_agent.conf b/src/collectd/collectd_sample_configs-latest/snmp_agent.conf
index 7cbde816..7cbde816 100644
--- a/src/collectd/collectd_sample_configs-master/snmp_agent.conf
+++ b/src/collectd/collectd_sample_configs-latest/snmp_agent.conf
diff --git a/src/collectd/collectd_sample_configs-master/virt.conf b/src/collectd/collectd_sample_configs-latest/virt.conf
index 88229e3c..88229e3c 100644
--- a/src/collectd/collectd_sample_configs-master/virt.conf
+++ b/src/collectd/collectd_sample_configs-latest/virt.conf
diff --git a/src/collectd/collectd_sample_configs-master/write_notification.sh b/src/collectd/collectd_sample_configs-latest/write_notification.sh
index 47ae9a83..47ae9a83 100755
--- a/src/collectd/collectd_sample_configs-master/write_notification.sh
+++ b/src/collectd/collectd_sample_configs-latest/write_notification.sh
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