diff --git a/.github/workflows/rules.yml b/.github/workflows/rules.yml
index d1fa039..1b4191b 100644
--- a/.github/workflows/rules.yml
+++ b/.github/workflows/rules.yml
@@ -1,8 +1,9 @@
+---
 name: Test Alertmanager rule files
-on:
+on:  # yamllint disable-line rule:truthy
   pull_request:
     paths:
-    - 'prometheus/*.rules'
+      - 'prometheus/*.rules'
   push:
     branches:
       - main
@@ -11,9 +12,9 @@ jobs:
   test-rules:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-go@v2
-      with:
-        go-version: "1.16"
-    - run: GO111MODULE=on go get github.com/prometheus/prometheus/cmd/promtool@35c88e511f6954fabeb441c13e4534142e879570
-    - run: promtool check rules prometheus/*.rules
+      - uses: actions/checkout@v2
+      - uses: actions/setup-go@v2
+        with:
+          go-version: "1.16"
+      - run: GO111MODULE=on go get github.com/prometheus/prometheus/cmd/promtool@35c88e511f6954fabeb441c13e4534142e879570
+      - run: promtool check rules prometheus/*.rules
diff --git a/.yamllint.yml b/.yamllint.yml
new file mode 100644
index 0000000..499c1a2
--- /dev/null
+++ b/.yamllint.yml
@@ -0,0 +1,11 @@
+---
+extends: default
+
+rules:
+  comments: enable
+  line-length: disable
+
+ignore: |
+  prometheus/prometheus.yml.d/51-ceph-nodeexporter.yml
+  prometheus/prometheus.yml.d/50-ceph.yml
+  prometheus/prometheus.yml.d/10-redfish.yml
diff --git a/grafana/provisioning.yaml b/grafana/provisioning.yaml
index 575125c..76d07f2 100644
--- a/grafana/provisioning.yaml
+++ b/grafana/provisioning.yaml
@@ -1,19 +1,20 @@
+---
 # config file version
 apiVersion: 1
 
 providers:
- - name: Ceph
-   folder: Ceph
-   type: file
-   options:
-     path: /var/lib/grafana/dashboards/ceph
- - name: Infrastructure
-   folder: Infrastructure
-   type: file
-   options:
-     path: /var/lib/grafana/dashboards/infrastructure
- - name: OpenStack
-   folder: OpenStack
-   type: file
-   options:
-     path: /var/lib/grafana/dashboards/openstack
+  - name: Ceph
+    folder: Ceph
+    type: file
+    options:
+      path: /var/lib/grafana/dashboards/ceph
+  - name: Infrastructure
+    folder: Infrastructure
+    type: file
+    options:
+      path: /var/lib/grafana/dashboards/infrastructure
+  - name: OpenStack
+    folder: OpenStack
+    type: file
+    options:
+      path: /var/lib/grafana/dashboards/openstack
diff --git a/kolla_globals/monitoring.yml b/kolla_globals/monitoring.yml
index 7adf655..aa442f6 100644
--- a/kolla_globals/monitoring.yml
+++ b/kolla_globals/monitoring.yml
@@ -1,8 +1,8 @@
 ---
 # TODO: don't put it here for kayobe
-kolla_enable_central_logging: True
-enable_prometheus_server: True
-kolla_enable_grafana: True
+kolla_enable_central_logging: True  # yamllint disable-line rule:truthy
+enable_prometheus_server: True  # yamllint disable-line rule:truthy
+kolla_enable_grafana: True  # yamllint disable-line rule:truthy
 
 # Allow Elasticsearch Curator to apply a retention policy to logs
 enable_elasticsearch_curator: true
@@ -20,7 +20,7 @@ prometheus_fluentd_exporter_port: 24224
 prometheus_cmdline_extras: '--storage.tsdb.retention.time=60d --storage.tsdb.retention.size=50GB'
 
 # kolla-ansible default, plus remove network stats
-#prometheus_cadvisor_cmdline_extras: "--docker_only --store_container_labels=false --disable_metrics=udp,sched,tcp,process,network"
+# prometheus_cadvisor_cmdline_extras: "--docker_only --store_container_labels=false --disable_metrics=udp,sched,tcp,process,network"
 prometheus_cadvisor_cmdline_extras: "--docker_only --store_container_labels=false --disable_metrics=percpu,referenced_memory,cpu_topology,resctrl,udp,advtcp,sched,hugetlb,memory_numa,tcp,process"
 
 # TODO: kayobe specific raw tags need removing in some cases, missing horizon