Skip to content

Commit

Permalink
install digitemp on pve1 now as well
Browse files Browse the repository at this point in the history
  • Loading branch information
spacelama committed Sep 29, 2024
1 parent 2fb38e9 commit e7ff6cc
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 6 deletions.
8 changes: 8 additions & 0 deletions files/etc/digitemp.conf.pve1
Original file line number Diff line number Diff line change
@@ -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
31 changes: 26 additions & 5 deletions hosts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -299,34 +311,40 @@ 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
host_is_zfs: true
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' }
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion repos/munin-contrib
Submodule munin-contrib updated 51 files
+39 −5 plugins/adguardhome/adguardhome_dns
+9 −6 plugins/amavis/amavis_
+60 −9 plugins/asterisk/asterisk
+12 −11 plugins/chrony/chrony_status
+205 −0 plugins/cpu/process_group
+1 −1 plugins/dhcp/kea
+255 −0 plugins/disk/gluster
+6 −2 plugins/disk/nvme
+25 −7 plugins/disk/stratis
+34 −7 plugins/docker/docker_
+69 −5 plugins/docker/docker_cpu
+77 −76 plugins/dovecot/dovecot
+114 −0 plugins/elasticsearch/elasticsearch_cache
+108 −0 plugins/elasticsearch/elasticsearch_cluster_health
+94 −0 plugins/elasticsearch/elasticsearch_cluster_nodes
+96 −0 plugins/elasticsearch/elasticsearch_cluster_shards
+103 −0 plugins/elasticsearch/elasticsearch_docs
+108 −0 plugins/elasticsearch/elasticsearch_gc_time
+108 −0 plugins/elasticsearch/elasticsearch_index_size
+112 −0 plugins/elasticsearch/elasticsearch_index_total
+111 −0 plugins/elasticsearch/elasticsearch_jvm_memory
+125 −0 plugins/elasticsearch/elasticsearch_jvm_pools_size
+104 −0 plugins/elasticsearch/elasticsearch_jvm_threads
+113 −0 plugins/elasticsearch/elasticsearch_open_files
+ plugins/http/example-graphs/http_responsecode-1.png
+3 −1 plugins/jitsi/jitsi_videobridge
+114 −0 plugins/network/dns/dnsperftest
+ plugins/network/dns/example-graphs/dnsperftest-day.png
+2 −2 plugins/network/if1sec-c.c
+100 −0 plugins/network/ipsec
+186 −0 plugins/network/keepalived
+201 −0 plugins/network/nft_counter
+1 −1 plugins/nextcloud/nextcloud_
+1 −1 plugins/nginx/nginx_vhost_traffic
+60 −5 plugins/pdns/pdns_queries
+2 −0 plugins/pdns/pdns_rel
+18 −8 plugins/quake/qstat
+123 −0 plugins/resolvectl/resolvectl
+229 −0 plugins/security/crowdsec
+80 −0 plugins/sensors/adb_temperatures
+ plugins/sensors/example-graphs/adb_temperatures-day.png
+ plugins/sensors/example-graphs/adb_temperatures-week.png
+204 −0 plugins/sensors/switchbotmeter_multi
+32 −3 plugins/ssl/letsencrypt_weekly
+226 −0 plugins/synapse/synapse_
+ plugins/system/example-graphs/inotify-day.png
+174 −0 plugins/system/inotify
+21 −5 plugins/varnish/varnish
+ plugins/wireguard/example-graphs/wireguard_peer_count.png
+ plugins/wireguard/example-graphs/wireguard_peer_traffic.png
+200 −0 plugins/wireguard/wireguard_

0 comments on commit e7ff6cc

Please sign in to comment.