From e7ff6ccc5cb18bf9f778de25d10f9b4fabac6aa6 Mon Sep 17 00:00:00 2001 From: Tim Connors Date: Sun, 29 Sep 2024 23:24:09 +1000 Subject: [PATCH] install digitemp on pve1 now as well --- files/etc/digitemp.conf.pve1 | 8 ++++++++ hosts.yml | 31 ++++++++++++++++++++++++++----- repos/munin-contrib | 2 +- 3 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 files/etc/digitemp.conf.pve1 diff --git a/files/etc/digitemp.conf.pve1 b/files/etc/digitemp.conf.pve1 new file mode 100644 index 0000000..1fa9e43 --- /dev/null +++ b/files/etc/digitemp.conf.pve1 @@ -0,0 +1,8 @@ +TTY /dev/ttyUSB0 +READ_TIME 1000 +LOG_TYPE 1 +LOG_FORMAT "%b %d %H:%M:%S Sensor %s C: %.2C F: %.2F" +CNT_FORMAT "%b %d %H:%M:%S Sensor %s #%n %C" +HUM_FORMAT "%b %d %H:%M:%S Sensor %s C: %.2C F: %.2F H: %h%%" +SENSORS 1 +ROM 0 0x28 0x3C 0x70 0xDD 0x06 0x00 0x00 0xAE diff --git a/hosts.yml b/hosts.yml index 07d3a82..7870770 100644 --- a/hosts.yml +++ b/hosts.yml @@ -265,11 +265,14 @@ all: host_is_nut_server: true unattended_upgrades: false # pve way too fragile and important to auto-patch pve1: + packages_to_install: [ 'digitemp' ] + inet_addr_suffix: 8 network_interfaces: - { interface_name: enge0, mac_addr: '18:66:da:e7:83:74' } - { interface_name: enxg0, mac_addr: '6c:92:bf:64:76:54' } - { interface_name: enxg1, mac_addr: '6c:92:bf:64:76:55' } + host_is_physical: true host_is_dell_server: true fan_speed_control_is_enabled: false @@ -282,6 +285,15 @@ all: host_is_nut_server: true unattended_upgrades: false # pve way too fragile and important to auto-patch + custom_files: + - name: /etc/digitemp.conf + source: etc/digitemp.conf.pve1 + - name: /etc/munin/plugins/digitemp_DS9097 + source: monitoring/munin/digitemp_ + mode: "0755" + local_follow: true + notify: restart munin-node + #modprobe_blacklist: "radeon,amdgpu,snd_hda_intel,xhci_hcd,xhci_pci" # vfio_ids: "ids=8086:8d31,8086:8d2d,8086:8d26" # obtain with: # just want to pass through XHCI @@ -299,6 +311,7 @@ all: - { interface_name: enge0, mac_addr: '04:42:1a:2d:76:29' } - { interface_name: enxg0, mac_addr: '6c:92:bf:76:49:a9' } - { interface_name: enxg1, mac_addr: '6c:92:bf:76:49:aa' } + host_is_physical: true host_is_amd: true host_is_pve_server: true @@ -306,27 +319,32 @@ all: host_is_in_pve_cluster: true host_can_have_spectre_mitigations: true # speed optimisations (+ addition of security flaw) not needed because AMD does so much better at spectre/meltdown unattended_upgrades: false # pve way too fragile and important to auto-patch + + custom_files: + - name: /etc/sensors.d/asus-tuf-gaming-b550-plus-wifi.conf + source: etc/sensors.d/asus-tuf-gaming-b550-plus-wifi.conf.pve2 + notify: run sensors -s + modprobe_blacklist: "radeon,amdgpu,snd_hda_intel,xhci_hcd,xhci_pci" modprobe: # detected with sensors-detect - nct6775 vfio_ids: "ids=1022:149c,1002:67df,1002:aaf0,1022:43ee,1022:1487,8086:2723" # obtain with: + # for d in /sys/kernel/iommu_groups/*/devices/*; do #n=${d#*/iommu_groups/*}; n=${n%%/*} # printf 'IOMMU Group %s ' "$n" # lspci -nns "${d##*/}" #done | grep --color -i -e USB -e VGA\ co -e XHCI -e Audio -e 'IOMMU Group 13' -e 'IOMMU Group 2[3489]' -e 1022:149c -e 1002:67df -e 1002:aaf0 -e 1022:43ee -e 1022:1487 # host_has_backports: true + ssh_host_rsa_key_pub: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDaKgXeqwkkw+tlnbUSA34MwHUtnghtsyHkQyOfdgJL5K8ezKEijkECNPdMheBDKHTB5L2KNxekh2mN3OS3l3i8yvteDEhXlOiQDip1kdlUPXydo9lAunIIwxUZX40AKjEY8iOwwHGSevGuBfHDjdiUh9DCtWobW2BbH7dhC9fX6u3x5RG28TCkdmjLUqahAVxmhw3wv/B9TBYq1Rn9ydFUGgwvMVM+1eAqxthn5ISSHuhK0aLUfrgsjz6tjDGGLFtrTOgDbKG2JeDIYG/jyD57OP9Ht3x1WAJmoSN4LJ2upXHUQubA2tmuZbgfgEZXtkTWaYLqulcP829tpR/9VfnWjqR0/KllPPdDQv3j+2w5ra7DeeqY+UVyC6GCTHykQZu7TGpl/N8h/yEEFm2ALTrqDcRWfN5clt/+aGUYwu/Vsb/esWRAJCmP7GlYz3Z87X/REHsV6xn+1k/X08x6KuHdJqcJB8gsn8aJIZ7qKRSyoMUVJMvuNS3CnZOyzUaJnSU= root@pve ssh_host_ecdsa_key_pub: ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLGQtLolSQw13PGsfTlDdvJfoREUmqNK7rHyvfv3z9CciLFXK6T907Go+B13kvSuvJG2XfKivp4o+yOC3NFmrJc= root@pve ssh_host_ed25519_key_pub: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHnUkqwxjgCpOpHaTCebqo79dKlPM5U7yiYKP7e+RdKM root@pve - custom_files: - - name: /etc/sensors.d/asus-tuf-gaming-b550-plus-wifi.conf - source: etc/sensors.d/asus-tuf-gaming-b550-plus-wifi.conf.pve2 - notify: run sensors -s pve3: # packages_to_install: [ 'firmware-realtek' ] # consider r8168-dkms if unstable: https://forum.proxmox.com/threads/system-hanging-after-upgrade-nic-driver.129366/page-2 also power management: https://forum.proxmox.com/threads/networking-issues-pve8.129742/ - packages_to_install: [ 'usbrelay', 'usbrelayd' ] + packages_to_install: [ 'usbrelay', 'usbrelayd', 'digitemp' ] + inet_addr_suffix: 7 network_interfaces: - { interface_name: enge0, mac_addr: '98:90:96:cb:dc:89' } @@ -337,6 +355,7 @@ all: # post-up /usr/bin/logger -p debug -t ifup "Disabling segmentation and LRO offload for $IFACE" && /sbin/ethtool -K $IFACE lro off tso off gso off && /usr/bin/logger -p debug -t ifup "Disabled offload for $IFACE" enge0_interface_addendum: "\tpost-up /usr/bin/logger -p debug -t ifup \"Disabling segmentation offload for $IFACE\" && /sbin/ethtool -K $IFACE tso off gso off && /usr/bin/logger -p debug -t ifup \"Disabled offload for $IFACE\"" # eth0_interface_addendum: "\toffload-tso off\n\toffload-gso off" # pve3 unit hang https://forum.proxmox.com/threads/e1000-driver-hang.58284/post-463259 into /etc/network/interfaces if no more unit hangs (might need more: https://forum.proxmox.com/threads/e1000-driver-hang.58284/post-512789 and ifupdown2 is cleaner: https://forum.proxmox.com/threads/e1000-driver-hang.58284/post-567651 ) + host_is_physical: true host_is_intel: true host_is_pve_server: true @@ -363,6 +382,7 @@ all: dell_smm_hwmon: "force=1" #aka i8k module in kernel6 - allows a bunch of fan and temperature metrics in Dell Optiplex 9020SFF modprobe: - dell_smm_hwmon + # modprobe_blacklist: # vfio_ids: "ids=1022:149c,1002:67df,1002:aaf0,1022:43ee,1022:1487" # obtain with: # for d in /sys/kernel/iommu_groups/*/devices/*; do @@ -371,6 +391,7 @@ all: # lspci -nns "${d##*/}" #done | grep --color -i -e USB -e VGA\ co -e XHCI -e Audio -e 'IOMMU Group 13' -e 'IOMMU Group 2[3489]' -e 1022:149c -e 1002:67df -e 1002:aaf0 -e 1022:43ee -e 1022:1487 # host_has_backports: true + ssh_host_rsa_key_pub: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDaKgXeqwkkw+tlnbUSA34MwHUtnghtsyHkQyOfdgJL5K8ezKEijkECNPdMheBDKHTB5L2KNxekh2mN3OS3l3i8yvteDEhXlOiQDip1kdlUPXydo9lAunIIwxUZX40AKjEY8iOwwHGSevGuBfHDjdiUh9DCtWobW2BbH7dhC9fX6u3x5RG28TCkdmjLUqahAVxmhw3wv/B9TBYq1Rn9ydFUGgwvMVM+1eAqxthn5ISSHuhK0aLUfrgsjz6tjDGGLFtrTOgDbKG2JeDIYG/jyD57OP9Ht3x1WAJmoSN4LJ2upXHUQubA2tmuZbgfgEZXtkTWaYLqulcP829tpR/9VfnWjqR0/KllPPdDQv3j+2w5ra7DeeqY+UVyC6GCTHykQZu7TGpl/N8h/yEEFm2ALTrqDcRWfN5clt/+aGUYwu/Vsb/esWRAJCmP7GlYz3Z87X/REHsV6xn+1k/X08x6KuHdJqcJB8gsn8aJIZ7qKRSyoMUVJMvuNS3CnZOyzUaJnSU= root@pve ssh_host_ecdsa_key_pub: ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLGQtLolSQw13PGsfTlDdvJfoREUmqNK7rHyvfv3z9CciLFXK6T907Go+B13kvSuvJG2XfKivp4o+yOC3NFmrJc= root@pve ssh_host_ed25519_key_pub: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHnUkqwxjgCpOpHaTCebqo79dKlPM5U7yiYKP7e+RdKM root@pve diff --git a/repos/munin-contrib b/repos/munin-contrib index f0ba460..dd02e9b 160000 --- a/repos/munin-contrib +++ b/repos/munin-contrib @@ -1 +1 @@ -Subproject commit f0ba4604e47ae41948ad837f6bf5b8f28ecaa18f +Subproject commit dd02e9bfb79fa4e6f3fb0528f9f1140eb1bc0442