aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Roques <oroques+fdio@cisco.com>2020-03-04 18:54:21 +0100
committerOlivier Roques <oroques+fdio@cisco.com>2020-03-04 19:17:15 +0100
commit24841120071b95f1a05167898b33091576ba15b8 (patch)
tree112ee40de2b88f441da8949891ded543b0009446
parent248bfd5ad0ae3cc17bbd3ea3b9a47fa8d075ee58 (diff)
[HICN-541] Change installation directory of collectd plugins
Signed-off-by: Olivier Roques <oroques+fdio@cisco.com> Change-Id: Ic298e57c11a0b86976d52096a2f691dd511adc3f
-rw-r--r--docs/source/telemetry.md6
-rw-r--r--telemetry/vpp-collectd/vpp-hicn/CMakeLists.txt2
-rw-r--r--telemetry/vpp-collectd/vpp/CMakeLists.txt2
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/source/telemetry.md b/docs/source/telemetry.md
index 5cc7515..84800c8 100644
--- a/docs/source/telemetry.md
+++ b/docs/source/telemetry.md
@@ -72,7 +72,7 @@ Edit the configuration file as the following:
# Global #
######################################################################
FQDNLookup true
-BaseDir "/collectd"
+BaseDir "/var/lib/collectd"
Interval 1
######################################################################
@@ -99,12 +99,12 @@ LoadPlugin vpp_hicn
# Plugin configuration #
######################################################################
<Plugin csv>
- DataDir "/collectd/csv" # the folder under which statistics are written in csv
+ DataDir "/var/lib/collectd/csv" # the folder where statistics are stored in csv
StoreRates true
</Plugin>
<Plugin rrdtool>
- DataDir "/collectd/rrd" # the folder under which statistics are written in rrd
+ DataDir "/var/lib/collectd/rrd" # the folder where statistics are stored in rrd
</Plugin>
```
diff --git a/telemetry/vpp-collectd/vpp-hicn/CMakeLists.txt b/telemetry/vpp-collectd/vpp-hicn/CMakeLists.txt
index ab048b7..fc39b93 100644
--- a/telemetry/vpp-collectd/vpp-hicn/CMakeLists.txt
+++ b/telemetry/vpp-collectd/vpp-hicn/CMakeLists.txt
@@ -48,7 +48,7 @@ build_library(vpp_hicn
SOURCES ${SOURCE_FILES}
LINK_LIBRARIES ${LIBRARIES}
INCLUDE_DIRS ${INCLUDE_DIRS}
- INSTALL_FULL_PATH_DIR ${CMAKE_INSTALL_PREFIX}/collectd
+ INSTALL_FULL_PATH_DIR ${CMAKE_INSTALL_PREFIX}/lib/collectd
COMPONENT "${COLLECTD_PLUGINS}"
DEPENDS ${DEPENDENCIES}
EMPTY_PREFIX true
diff --git a/telemetry/vpp-collectd/vpp/CMakeLists.txt b/telemetry/vpp-collectd/vpp/CMakeLists.txt
index 71fb7fc..36248b1 100644
--- a/telemetry/vpp-collectd/vpp/CMakeLists.txt
+++ b/telemetry/vpp-collectd/vpp/CMakeLists.txt
@@ -36,7 +36,7 @@ build_library(vpp
SOURCES ${SOURCE_FILES}
LINK_LIBRARIES ${LIBRARIES}
INCLUDE_DIRS ${INCLUDE_DIRS}
- INSTALL_FULL_PATH_DIR ${CMAKE_INSTALL_PREFIX}/collectd
+ INSTALL_FULL_PATH_DIR ${CMAKE_INSTALL_PREFIX}/lib/collectd
COMPONENT ${COLLECTD_PLUGINS}
EMPTY_PREFIX true
)