diff --git a/collectd.container b/collectd.container deleted file mode 100644 index 44333aa..0000000 --- a/collectd.container +++ /dev/null @@ -1,26 +0,0 @@ -# vim: set ft=systemd : -[Unit] -Description=Collectd statistics daemon -After=network.target -Wants=network.target - -[Container] -Image=git.pyrocufflink.net/containerimages/collectd:latest -Volume=/etc/collectd.d:/etc/collectd.d:ro -Volume=/run:/run:rw -Tmpfs=/tmp -Network=host -SecurityLabelDisable=true -PodmanArgs=--privileged -PodmanArgs=--ipc=host -PodmanArgs=--uts=host -PodmanArgs=--pid=host -PodmanArgs=--cgroupns=host - -[Service] -Restart=always -StartLimitIntervalSec=10s -StartLimitBurst=10 - -[Install] -WantedBy=multi-user.target diff --git a/collectd.yaml b/collectd.yaml index 4c3cbd6..8ed3177 100644 --- a/collectd.yaml +++ b/collectd.yaml @@ -1,13 +1,22 @@ variant: fcos version: 1.4.0 +ignition: + config: + merge: + - local: packages.yaml + storage: files: - - path: /etc/containers/systemd/collectd.container + - path: /etc/ignition/packages.d/collectd mode: 0644 contents: - local: collectd.container - + inline: | + collectd + collectd-chrony + collectd-disk + collectd-sensors + collectd-write_prometheus - path: /etc/collectd.d/df.conf mode: 0644 contents: @@ -18,7 +27,6 @@ storage: FSType overlay IgnoreSelected true - - path: /etc/collectd.d/plugins.conf mode: 0644 contents: @@ -42,3 +50,8 @@ storage: Port 9103 + +systemd: + units: + - name: collectd.service + enabled: true