summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/collectd/collectd_sample_configs-master/csv.conf (renamed from src/collectd/collectd_sample_configs-latest/csv.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-master/default_plugins.conf (renamed from src/collectd/collectd_sample_configs-latest/default_plugins.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-master/dpdkevents.conf (renamed from src/collectd/collectd_sample_configs-latest/dpdkevents.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-master/dpdkstat.conf (renamed from src/collectd/collectd_sample_configs-latest/dpdkstat.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-master/exec.conf (renamed from src/collectd/collectd_sample_configs-latest/exec.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-master/hugepages.conf (renamed from src/collectd/collectd_sample_configs-latest/hugepages.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-master/intel_pmu.conf (renamed from src/collectd/collectd_sample_configs-latest/intel_pmu.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-master/kafka.conf (renamed from src/collectd/collectd_sample_configs-latest/kafka.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-master/mcelog.conf (renamed from src/collectd/collectd_sample_configs-latest/mcelog.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-master/network.conf (renamed from src/collectd/collectd_sample_configs-latest/network.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-master/ovs_events.conf (renamed from src/collectd/collectd_sample_configs-latest/ovs_events.conf)0
-rwxr-xr-xsrc/collectd/collectd_sample_configs-master/ovs_pmd_stats.sh (renamed from src/collectd/collectd_sample_configs-latest/ovs_pmd_stats.sh)0
-rw-r--r--src/collectd/collectd_sample_configs-master/ovs_stats.conf (renamed from src/collectd/collectd_sample_configs-latest/ovs_stats.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-master/pcie_errors.conf (renamed from src/collectd/collectd_sample_configs-latest/pcie_errors.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-master/prometheus.conf (renamed from src/collectd/collectd_sample_configs-latest/prometheus.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-master/rdt.conf (renamed from src/collectd/collectd_sample_configs-latest/rdt.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-master/snmp_agent.conf (renamed from src/collectd/collectd_sample_configs-latest/snmp_agent.conf)0
-rw-r--r--src/collectd/collectd_sample_configs-master/virt.conf (renamed from src/collectd/collectd_sample_configs-latest/virt.conf)0
-rwxr-xr-xsrc/collectd/collectd_sample_configs-master/write_notification.sh (renamed from src/collectd/collectd_sample_configs-latest/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-latest/csv.conf b/src/collectd/collectd_sample_configs-master/csv.conf
index 99a8498d..99a8498d 100644
--- a/src/collectd/collectd_sample_configs-latest/csv.conf
+++ b/src/collectd/collectd_sample_configs-master/csv.conf
diff --git a/src/collectd/collectd_sample_configs-latest/default_plugins.conf b/src/collectd/collectd_sample_configs-master/default_plugins.conf
index c96b0076..c96b0076 100644
--- a/src/collectd/collectd_sample_configs-latest/default_plugins.conf
+++ b/src/collectd/collectd_sample_configs-master/default_plugins.conf
diff --git a/src/collectd/collectd_sample_configs-latest/dpdkevents.conf b/src/collectd/collectd_sample_configs-master/dpdkevents.conf
index fdb6f3db..fdb6f3db 100644
--- a/src/collectd/collectd_sample_configs-latest/dpdkevents.conf
+++ b/src/collectd/collectd_sample_configs-master/dpdkevents.conf
diff --git a/src/collectd/collectd_sample_configs-latest/dpdkstat.conf b/src/collectd/collectd_sample_configs-master/dpdkstat.conf
index 59906d4e..59906d4e 100644
--- a/src/collectd/collectd_sample_configs-latest/dpdkstat.conf
+++ b/src/collectd/collectd_sample_configs-master/dpdkstat.conf
diff --git a/src/collectd/collectd_sample_configs-latest/exec.conf b/src/collectd/collectd_sample_configs-master/exec.conf
index 0a291bdb..0a291bdb 100644
--- a/src/collectd/collectd_sample_configs-latest/exec.conf
+++ b/src/collectd/collectd_sample_configs-master/exec.conf
diff --git a/src/collectd/collectd_sample_configs-latest/hugepages.conf b/src/collectd/collectd_sample_configs-master/hugepages.conf
index 97cd2d17..97cd2d17 100644
--- a/src/collectd/collectd_sample_configs-latest/hugepages.conf
+++ b/src/collectd/collectd_sample_configs-master/hugepages.conf
diff --git a/src/collectd/collectd_sample_configs-latest/intel_pmu.conf b/src/collectd/collectd_sample_configs-master/intel_pmu.conf
index 959fb8a1..959fb8a1 100644
--- a/src/collectd/collectd_sample_configs-latest/intel_pmu.conf
+++ b/src/collectd/collectd_sample_configs-master/intel_pmu.conf
diff --git a/src/collectd/collectd_sample_configs-latest/kafka.conf b/src/collectd/collectd_sample_configs-master/kafka.conf
index f81e87fd..f81e87fd 100644
--- a/src/collectd/collectd_sample_configs-latest/kafka.conf
+++ b/src/collectd/collectd_sample_configs-master/kafka.conf
diff --git a/src/collectd/collectd_sample_configs-latest/mcelog.conf b/src/collectd/collectd_sample_configs-master/mcelog.conf
index 633a3bcd..633a3bcd 100644
--- a/src/collectd/collectd_sample_configs-latest/mcelog.conf
+++ b/src/collectd/collectd_sample_configs-master/mcelog.conf
diff --git a/src/collectd/collectd_sample_configs-latest/network.conf b/src/collectd/collectd_sample_configs-master/network.conf
index 4309ed86..4309ed86 100644
--- a/src/collectd/collectd_sample_configs-latest/network.conf
+++ b/src/collectd/collectd_sample_configs-master/network.conf
diff --git a/src/collectd/collectd_sample_configs-latest/ovs_events.conf b/src/collectd/collectd_sample_configs-master/ovs_events.conf
index 250e1e43..250e1e43 100644
--- a/src/collectd/collectd_sample_configs-latest/ovs_events.conf
+++ b/src/collectd/collectd_sample_configs-master/ovs_events.conf
diff --git a/src/collectd/collectd_sample_configs-latest/ovs_pmd_stats.sh b/src/collectd/collectd_sample_configs-master/ovs_pmd_stats.sh
index 78e72047..78e72047 100755
--- a/src/collectd/collectd_sample_configs-latest/ovs_pmd_stats.sh
+++ b/src/collectd/collectd_sample_configs-master/ovs_pmd_stats.sh
diff --git a/src/collectd/collectd_sample_configs-latest/ovs_stats.conf b/src/collectd/collectd_sample_configs-master/ovs_stats.conf
index 2a6d2fb2..2a6d2fb2 100644
--- a/src/collectd/collectd_sample_configs-latest/ovs_stats.conf
+++ b/src/collectd/collectd_sample_configs-master/ovs_stats.conf
diff --git a/src/collectd/collectd_sample_configs-latest/pcie_errors.conf b/src/collectd/collectd_sample_configs-master/pcie_errors.conf
index de9b7533..de9b7533 100644
--- a/src/collectd/collectd_sample_configs-latest/pcie_errors.conf
+++ b/src/collectd/collectd_sample_configs-master/pcie_errors.conf
diff --git a/src/collectd/collectd_sample_configs-latest/prometheus.conf b/src/collectd/collectd_sample_configs-master/prometheus.conf
index 13ef328e..13ef328e 100644
--- a/src/collectd/collectd_sample_configs-latest/prometheus.conf
+++ b/src/collectd/collectd_sample_configs-master/prometheus.conf
diff --git a/src/collectd/collectd_sample_configs-latest/rdt.conf b/src/collectd/collectd_sample_configs-master/rdt.conf
index ae983dc0..ae983dc0 100644
--- a/src/collectd/collectd_sample_configs-latest/rdt.conf
+++ b/src/collectd/collectd_sample_configs-master/rdt.conf
diff --git a/src/collectd/collectd_sample_configs-latest/snmp_agent.conf b/src/collectd/collectd_sample_configs-master/snmp_agent.conf
index 7cbde816..7cbde816 100644
--- a/src/collectd/collectd_sample_configs-latest/snmp_agent.conf
+++ b/src/collectd/collectd_sample_configs-master/snmp_agent.conf
diff --git a/src/collectd/collectd_sample_configs-latest/virt.conf b/src/collectd/collectd_sample_configs-master/virt.conf
index 88229e3c..88229e3c 100644
--- a/src/collectd/collectd_sample_configs-latest/virt.conf
+++ b/src/collectd/collectd_sample_configs-master/virt.conf
diff --git a/src/collectd/collectd_sample_configs-latest/write_notification.sh b/src/collectd/collectd_sample_configs-master/write_notification.sh
index 47ae9a83..47ae9a83 100755
--- a/src/collectd/collectd_sample_configs-latest/write_notification.sh
+++ b/src/collectd/collectd_sample_configs-master/write_notification.sh
diff --git a/src/package-list.mk b/src/package-list.mk
index 0e9b5adc..dce32cfb 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
-# -"latest" - development version, based on main branch
+# -"master" - 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.11
SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs
else
-# 'latest' and 'experimental' collectd flavors are both using
+# 'master' and 'experimental' collectd flavors are both using
# code from main branch
COLLECTD_TAG ?= main
- SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs-latest
+ SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs-master
ifeq ($(COLLECTD_FLAVOR), experimental)
# 'experimental' flavor is using additional Pull Requests that
# are put on top of main release