From bbbe8534d00b44619f31dc8d0061ec95e6fea44a Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Sun, 24 Sep 2023 01:30:44 -0500 Subject: [PATCH 1/3] feat: add pcp monitoring Closes #78 --- README.md | 1 + main/packages.json | 2 ++ 2 files changed, 3 insertions(+) diff --git a/README.md b/README.md index d93699e..9a978c1 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ Suitable for running containerized workloads on either baremetal or virtual mach - [distrobox](https://github.com/89luca89/distrobox) - guest VM agents (`qemu-guest-agent` and `open-vm-tools`) - moby-engine(docker), docker-compose and podman-compose + - [pcp](https://pcp.io) Performance Co-pilot monitoring - [tailscale](https://tailscale.com) and [wireguard-tools](https://www.wireguard.com) - [tmux](https://github.com/tmux/tmux/wiki/Getting-Started) - Optional ZFS versions also add: diff --git a/main/packages.json b/main/packages.json index 408ac6d..5fd1b2a 100644 --- a/main/packages.json +++ b/main/packages.json @@ -3,6 +3,7 @@ "include": { "all": [ "cockpit-networkmanager", + "cockpit-pcp", "cockpit-podman", "cockpit-selinux", "cockpit-storaged", @@ -10,6 +11,7 @@ "distrobox", "firewalld", "open-vm-tools", + "pcp-zeroconf", "podman", "podman-compose", "qemu-guest-agent", From e3b9b577de1d7bdc04e160e37d1acf8bbb9d30ad Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Wed, 13 Mar 2024 20:14:55 -0500 Subject: [PATCH 2/3] fix: add pmcd log directory with tmpfiles.d This is copied from https://github.com/ublue-os/bluefin/pull/953 and should enable PCP to work as expected. --- ucore/usr/lib/tmpfiles.d/pmcd.conf | 1 + 1 file changed, 1 insertion(+) create mode 100644 ucore/usr/lib/tmpfiles.d/pmcd.conf diff --git a/ucore/usr/lib/tmpfiles.d/pmcd.conf b/ucore/usr/lib/tmpfiles.d/pmcd.conf new file mode 100644 index 0000000..fb04161 --- /dev/null +++ b/ucore/usr/lib/tmpfiles.d/pmcd.conf @@ -0,0 +1 @@ +d /var/log/pcp/pmcd - - - - \ No newline at end of file From 99139d2386d77428ca1fda52c55fd59189b2cbfd Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Wed, 13 Mar 2024 23:23:45 -0500 Subject: [PATCH 3/3] feat: extra dirs in tmpfiles.d to enable pmie/pmlogger --- README.md | 2 +- ucore/packages.json | 4 ++-- ucore/usr/lib/tmpfiles.d/pcp-ucore.conf | 17 +++++++++++++++++ ucore/usr/lib/tmpfiles.d/pmcd.conf | 1 - 4 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 ucore/usr/lib/tmpfiles.d/pcp-ucore.conf delete mode 100644 ucore/usr/lib/tmpfiles.d/pmcd.conf diff --git a/README.md b/README.md index f04f691..e3193c6 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,6 @@ Suitable for running containerized workloads on either bare metal or virtual mac - [firewalld](https://firewalld.org/) - guest VM agents (`qemu-guest-agent` and `open-vm-tools`)) - [docker-compose](https://github.com/docker/compose) and [podman-compose](https://github.com/containers/podman-compose) *docker(moby-engine) and podman are pre-installed in CoreOS* - - [pcp](https://pcp.io) Performance Co-pilot monitoring - [tailscale](https://tailscale.com) and [wireguard-tools](https://www.wireguard.com) - [tmux](https://github.com/tmux/tmux/wiki/Getting-Started) - udev rules enabling full functionality on some [Realtek 2.5Gbit USB Ethernet](https://github.com/wget/realtek-r8152-linux/) devices @@ -84,6 +83,7 @@ This image builds on `ucore-minimal` but adds drivers, storage tools and utiliti - intel wifi firmware - CoreOS omits this despite including atheros wifi firmware... hardware enablement FTW - [mergerfs](https://github.com/trapexit/mergerfs) - nfs-utils - nfs utils including daemon for kernel NFS server + - [pcp](https://pcp.io) Performance Co-pilot monitoring - [samba](https://www.samba.org/) and samba-usershares to provide SMB sevices - [snapraid](https://www.snapraid.it/) - usbutils(and pciutils) - technically pciutils is pulled in by open-vm-tools in ucore-minimal diff --git a/ucore/packages.json b/ucore/packages.json index 9ec128c..02973de 100644 --- a/ucore/packages.json +++ b/ucore/packages.json @@ -4,13 +4,11 @@ "all": [], "ucore-minimal": [ "cockpit-networkmanager", - "cockpit-pcp", "cockpit-podman", "cockpit-selinux", "cockpit-system", "firewalld", "open-vm-tools", - "pcp-zeroconf", "podman", "podman-compose", "qemu-guest-agent", @@ -20,6 +18,7 @@ "wireguard-tools" ], "ucore": [ + "cockpit-pcp", "cockpit-storaged", "distrobox", "duperemove", @@ -27,6 +26,7 @@ "iwlwifi-dvm-firmware", "iwlwifi-mvm-firmware", "nfs-utils", + "pcp-zeroconf", "pciutils", "samba", "samba-usershares", diff --git a/ucore/usr/lib/tmpfiles.d/pcp-ucore.conf b/ucore/usr/lib/tmpfiles.d/pcp-ucore.conf new file mode 100644 index 0000000..9994470 --- /dev/null +++ b/ucore/usr/lib/tmpfiles.d/pcp-ucore.conf @@ -0,0 +1,17 @@ +d /var/lib/pcp/config/pmda 0775 pcp pcp - +d /var/lib/pcp/config/pmie 0775 pcp pcp - +d /var/lib/pcp/config/pmlogger 0775 pcp pcp - +d /var/lib/pcp/tmp 0775 pcp pcp - +d /var/lib/pcp/tmp/bash 0775 pcp pcp - +d /var/lib/pcp/tmp/json 0775 pcp pcp - +d /var/lib/pcp/tmp/mmv 0775 pcp pcp - +d /var/lib/pcp/tmp/pmie 0775 pcp pcp - +d /var/lib/pcp/tmp/pmlogger 0775 pcp pcp - +d /var/lib/pcp/tmp/pmproxy 0775 pcp pcp - +d /var/log/pcp 0775 pcp pcp - +d /var/log/pcp/pmcd 0775 pcp pcp - +d /var/log/pcp/pmfind 0775 pcp pcp - +d /var/log/pcp/pmie 0775 pcp pcp - +d /var/log/pcp/pmlogger 0775 pcp pcp - +d /var/log/pcp/pmproxy 0775 pcp pcp - +d /var/log/pcp/sa 0775 pcp pcp - \ No newline at end of file diff --git a/ucore/usr/lib/tmpfiles.d/pmcd.conf b/ucore/usr/lib/tmpfiles.d/pmcd.conf deleted file mode 100644 index fb04161..0000000 --- a/ucore/usr/lib/tmpfiles.d/pmcd.conf +++ /dev/null @@ -1 +0,0 @@ -d /var/log/pcp/pmcd - - - - \ No newline at end of file