From 494c20263de725ef915b17233f1d2931a608b5b4 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Wed, 27 Dec 2023 11:37:13 -0500 Subject: [PATCH] Move monitoring folder to top level --- .flake8 | 2 +- debian/pvc-daemon-node.install | 2 +- {node-daemon/monitoring => monitoring}/README.md | 0 {node-daemon/monitoring => monitoring}/checkmk/pvc | 0 {node-daemon/monitoring => monitoring}/checkmk/pvc.py | 0 {node-daemon/monitoring => monitoring}/munin/ceph_utilization | 0 {node-daemon/monitoring => monitoring}/munin/pvc | 0 .../prometheus/grafana-pvc-health-dashboard.json | 0 .../monitoring => monitoring}/prometheus/prometheus.yml | 0 .../prometheus/targets-pvc_cluster.json | 0 10 files changed, 2 insertions(+), 2 deletions(-) rename {node-daemon/monitoring => monitoring}/README.md (100%) rename {node-daemon/monitoring => monitoring}/checkmk/pvc (100%) rename {node-daemon/monitoring => monitoring}/checkmk/pvc.py (100%) rename {node-daemon/monitoring => monitoring}/munin/ceph_utilization (100%) rename {node-daemon/monitoring => monitoring}/munin/pvc (100%) rename {node-daemon/monitoring => monitoring}/prometheus/grafana-pvc-health-dashboard.json (100%) rename {node-daemon/monitoring => monitoring}/prometheus/prometheus.yml (100%) rename {node-daemon/monitoring => monitoring}/prometheus/targets-pvc_cluster.json (100%) diff --git a/.flake8 b/.flake8 index 855363ae..eea08d17 100644 --- a/.flake8 +++ b/.flake8 @@ -8,7 +8,7 @@ ignore = W503, E501, F403, F405 extend-ignore = E203 # We exclude the Debian, migrations, and provisioner examples -exclude = debian,api-daemon/migrations/versions,api-daemon/provisioner/examples,node-daemon/monitoring +exclude = debian,monitoring,api-daemon/migrations/versions,api-daemon/provisioner/examples # Set the max line length to 88 for Black max-line-length = 88 diff --git a/debian/pvc-daemon-node.install b/debian/pvc-daemon-node.install index 14ab9b64..a6be902a 100644 --- a/debian/pvc-daemon-node.install +++ b/debian/pvc-daemon-node.install @@ -3,4 +3,4 @@ node-daemon/pvcnoded usr/share/pvc node-daemon/pvcnoded.service lib/systemd/system node-daemon/pvc.target lib/systemd/system node-daemon/pvcautoready.service lib/systemd/system -node-daemon/monitoring usr/share/pvc +monitoring usr/share/pvc diff --git a/node-daemon/monitoring/README.md b/monitoring/README.md similarity index 100% rename from node-daemon/monitoring/README.md rename to monitoring/README.md diff --git a/node-daemon/monitoring/checkmk/pvc b/monitoring/checkmk/pvc similarity index 100% rename from node-daemon/monitoring/checkmk/pvc rename to monitoring/checkmk/pvc diff --git a/node-daemon/monitoring/checkmk/pvc.py b/monitoring/checkmk/pvc.py similarity index 100% rename from node-daemon/monitoring/checkmk/pvc.py rename to monitoring/checkmk/pvc.py diff --git a/node-daemon/monitoring/munin/ceph_utilization b/monitoring/munin/ceph_utilization similarity index 100% rename from node-daemon/monitoring/munin/ceph_utilization rename to monitoring/munin/ceph_utilization diff --git a/node-daemon/monitoring/munin/pvc b/monitoring/munin/pvc similarity index 100% rename from node-daemon/monitoring/munin/pvc rename to monitoring/munin/pvc diff --git a/node-daemon/monitoring/prometheus/grafana-pvc-health-dashboard.json b/monitoring/prometheus/grafana-pvc-health-dashboard.json similarity index 100% rename from node-daemon/monitoring/prometheus/grafana-pvc-health-dashboard.json rename to monitoring/prometheus/grafana-pvc-health-dashboard.json diff --git a/node-daemon/monitoring/prometheus/prometheus.yml b/monitoring/prometheus/prometheus.yml similarity index 100% rename from node-daemon/monitoring/prometheus/prometheus.yml rename to monitoring/prometheus/prometheus.yml diff --git a/node-daemon/monitoring/prometheus/targets-pvc_cluster.json b/monitoring/prometheus/targets-pvc_cluster.json similarity index 100% rename from node-daemon/monitoring/prometheus/targets-pvc_cluster.json rename to monitoring/prometheus/targets-pvc_cluster.json