From df193e7653796bdf32f63043b0ceb18e7463da63 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Wed, 3 Apr 2024 16:46:46 +0200 Subject: [PATCH] same --- group_vars/all.yml | 6 ++--- group_vars/docker.yml | 16 ++++++------- group_vars/fileserver.yml | 4 ++-- group_vars/pbs.yml | 18 +++++++-------- group_vars/pve.yml | 28 +++++++++++------------ roles/mgrote_munin_node/defaults/main.yml | 2 +- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index 637640c5..976c1369 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -198,14 +198,14 @@ munin_node_plugins: - name: chrony src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/chrony/chrony - name: systemd_status - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/systemd/systemd_status - name: systemd_mem - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_mem + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/systemd/systemd_mem config: | [systemd_mem] env.all_services true - name: lvm_ - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/disk/lvm_ + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/disk/lvm_ config: | [lvm_*] user root diff --git a/group_vars/docker.yml b/group_vars/docker.yml index 40a5684b..ac2e7287 100644 --- a/group_vars/docker.yml +++ b/group_vars/docker.yml @@ -82,14 +82,14 @@ systemd_resolved_nameserver: 192.168.2.37 munin_node_allowed_cidrs: [0.0.0.0/0] # weil der munin-server aus einem anderen subnet zugreift munin_node_plugins: - name: systemd_status - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/systemd/systemd_status - name: systemd_mem - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_mem + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/systemd/systemd_mem config: | [systemd_mem] env.all_services true - name: lvm_ - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/disk/lvm_ + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/disk/lvm_ config: | [lvm_*] user root @@ -101,19 +101,19 @@ munin_node_plugins: env.config_dir /etc/fail2ban user root - name: docker_containers - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_ + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_ config: | [docker_*] user root env.DOCKER_HOST unix://run/docker.sock - name: docker_cpu - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_ + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_ - name: docker_memory - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_ + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_ - name: docker_network - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_ + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_ - name: docker_volumes - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_ + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_ - name: docker_volumesize src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_volumesize - name: chrony diff --git a/group_vars/fileserver.yml b/group_vars/fileserver.yml index 1f7e4a9f..40250a82 100644 --- a/group_vars/fileserver.yml +++ b/group_vars/fileserver.yml @@ -36,9 +36,9 @@ munin_node_plugins: - name: chrony src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/chrony/chrony - name: systemd_status - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/systemd/systemd_status - name: systemd_mem - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_mem + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/systemd/systemd_mem config: | [systemd_mem] env.all_services true diff --git a/group_vars/pbs.yml b/group_vars/pbs.yml index 4952177f..c2b18237 100644 --- a/group_vars/pbs.yml +++ b/group_vars/pbs.yml @@ -36,9 +36,9 @@ munin_node_plugins: - name: chrony src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/chrony/chrony - name: systemd_status - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/systemd/systemd_status - name: systemd_mem - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_mem + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/systemd/systemd_mem config: | [systemd_mem] env.all_services true @@ -50,22 +50,22 @@ munin_node_plugins: env.config_dir /etc/fail2ban user root - name: zfs_arcstats - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zfs_arcstats + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/zfs/zfs_arcstats - name: zfsonlinux_stats_ - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zfsonlinux_stats_ + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/zfs/zfsonlinux_stats_ - name: zpool_iostat - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zpool_iostat + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/zfs/zpool_iostat - name: zfs_list - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zfs_list + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/zfs/zfs_list config: | [zfs_list] env.ignore_datasets_pattern autodaily - name: zfs_count - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zfs_pool_dataset_count + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/zfs/zfs_pool_dataset_count - name: zpool_iostat - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zpool_iostat + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/zfs/zpool_iostat - name: zpool_capacity - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zpool_capacity + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/zfs/zpool_capacity munin_node_disabled_plugins: - meminfo # zu hohe last - hddtemp2 # ersetzt durch hddtemp_smartctl diff --git a/group_vars/pve.yml b/group_vars/pve.yml index 8fee399d..6e8aa92b 100644 --- a/group_vars/pve.yml +++ b/group_vars/pve.yml @@ -41,9 +41,9 @@ munin_node_plugins: - name: chrony src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/chrony/chrony - name: systemd_status - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_status + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/systemd/systemd_status - name: systemd_mem - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/systemd/systemd_mem + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/systemd/systemd_mem config: | [systemd_mem] env.all_services true @@ -55,39 +55,39 @@ munin_node_plugins: env.config_dir /etc/fail2ban user root - name: zfs_arcstats - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zfs_arcstats + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/zfs/zfs_arcstats - name: zfsonlinux_stats_ - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zfsonlinux_stats_ + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/zfs/zfsonlinux_stats_ - name: zpool_iostat - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zpool_iostat + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/zfs/zpool_iostat - name: zfs_list - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zfs_list + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/zfs/zfs_list config: | [zfs_list] env.ignore_datasets_pattern autodaily - name: zpool_capacity - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zpool_capacity + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/zfs/zpool_capacity - name: kvm_mem - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/libvirt/kvm_mem + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/libvirt/kvm_mem - name: kvm_net - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/libvirt/kvm_net + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/libvirt/kvm_net - name: kvm_io - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/libvirt/kvm_io + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/libvirt/kvm_io config: | [kvm_io] user root - name: kvm_cpu - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/libvirt/kvm_cpu + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/libvirt/kvm_cpu - name: proxmox_count - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/proxmox/proxmox_vm_count + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/proxmox/proxmox_vm_count config: | [proxmox_count] user root group root - name: zfs_count - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/zfs/zfs_pool_dataset_count + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/zfs/zfs_pool_dataset_count - name: ksm_ - src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/system/kernel_same_page_merging + src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/system/kernel_same_page_merging munin_node_disabled_plugins: - meminfo # zu hohe last - hddtemp2 # ersetzt durch hddtemp_smartctl diff --git a/roles/mgrote_munin_node/defaults/main.yml b/roles/mgrote_munin_node/defaults/main.yml index fafaf701..cea5df43 100644 --- a/roles/mgrote_munin_node/defaults/main.yml +++ b/roles/mgrote_munin_node/defaults/main.yml @@ -22,7 +22,7 @@ munin_plugin_dest_path: /etc/munin/plugins/ munin_plugin_conf_dest_path: /etc/munin/plugin-conf.d/ # munin_node_plugins: #plugins to install # - name: docker_volumes # name -# src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/docker/docker_ #src +# src: https://git.mgrote.net/mirrors/munin-contrib/raw/branch/master/plugins/docker/docker_ #src # config_file_name: /etc/munin/plugin-conf.d/docker # where to put plugin config # content of config # config: |