From 818382b6129a61bf49bb062ccd4503386768d797 Mon Sep 17 00:00:00 2001
From: fedy95 <fedy95@protonmail.com>
Date: Tue, 6 Apr 2021 20:51:02 +0300
Subject: [PATCH] fix-ssh-pipeline

---
 .drone.yml | 23 ++++++++++++++++++-----
 Makefile   | 29 ++++++++++++++++++-----------
 2 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index ed03207..dfc531b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,7 +1,7 @@
 ---
 kind: pipeline
 type: docker
-name: pull
+name: pull_request
 image_pull_secrets:
   - dockerconfigjson
 
@@ -9,21 +9,34 @@ steps:
   - name: lint yaml
     image: registry.fedy95.com/baseimage-yamllint:latest
     commands:
-      - yamllint -c /yamllint/relaxed.yaml .
+      - yamllint -c /yamllint/relaxed.yaml alertmanager/config.yml
+      - yamllint -c /yamllint/relaxed.yaml grafana/provisioning/dashboards/dashboard.yml
+      - yamllint -c /yamllint/relaxed.yaml grafana/provisioning/datasources/datasource.yml
+      - yamllint -c /yamllint/relaxed.yaml prometheus/prometheus.yml
+      - yamllint -c /yamllint/relaxed.yaml promtail/etc/promtail/config.yml
+      - yamllint -c /yamllint/relaxed.yaml docker-compose.yml
     when:
       event: pull_request
   - name: lint json
     image: registry.fedy95.com/baseimage-jsonlint:latest
     commands:
-      - find . -name "*.json" | xargs -n 1 jsonlint -qc
+      - jsonlint -qc grafana/provisioning/dashboards/docker_containers.json
+      - jsonlint -qc grafana/provisioning/dashboards/i-o-statistics.json
+      - jsonlint -qc grafana/provisioning/dashboards/monitor_services.json
+      - jsonlint -qc grafana/provisioning/dashboards/nexus_host.json
+      - jsonlint -qc grafana/provisioning/dashboards/nginx_container.json
+      - jsonlint -qc grafana/provisioning/dashboards/node-exporter.json
+      - jsonlint -qc grafana/provisioning/dashboards/smart-1.json
+      - jsonlint -qc grafana/provisioning/dashboards/smart-2.json
+      - jsonlint -qc grafana/provisioning/dashboards/smart-3.json
+      - jsonlint -qc grafana/provisioning/dashboards/smart-4.json
     when:
       event: pull_request
 
-...
 ---
 kind: pipeline
 type: ssh
-name: default
+name: master_push
 
 clone:
   disable: true
diff --git a/Makefile b/Makefile
index b58ef78..125d0b1 100644
--- a/Makefile
+++ b/Makefile
@@ -7,22 +7,29 @@ JSONLINT_TAG=baseimage-jsonlint:latest
 
 lint: lint-yaml lint-json
 
+LINT-YAML-CMD=docker run --rm -it -v $(PWD):/data ${REGISTRY}/${YAMLLINT_TAG}
 lint-yaml:
 	docker pull ${REGISTRY}/${YAMLLINT_TAG}
-	docker run --rm -it -v $(PWD):/data ${REGISTRY}/${YAMLLINT_TAG} .
+	$(LINT-YAML-CMD) alertmanager/config.yml
+	$(LINT-YAML-CMD) grafana/provisioning/dashboards/dashboard.yml
+	$(LINT-YAML-CMD) grafana/provisioning/datasources/datasource.yml
+	$(LINT-YAML-CMD) prometheus/prometheus.yml
+	$(LINT-YAML-CMD) promtail/etc/promtail/config.yml
+	$(LINT-YAML-CMD) docker-compose.yml
 
+LINT-JSON-CMD=docker run --rm -it -v $(PWD):/data ${REGISTRY}/${JSONLINT_TAG}
 lint-json:
 	docker pull ${REGISTRY}/${JSONLINT_TAG}
-	docker run --rm -it -v $(PWD):/data ${REGISTRY}/${JSONLINT_TAG} -qc grafana/provisioning/dashboards/docker_containers.json
-	docker run --rm -it -v $(PWD):/data ${REGISTRY}/${JSONLINT_TAG} -qc grafana/provisioning/dashboards/i-o-statistics.json
-	docker run --rm -it -v $(PWD):/data ${REGISTRY}/${JSONLINT_TAG} -qc grafana/provisioning/dashboards/monitor_services.json
-	docker run --rm -it -v $(PWD):/data ${REGISTRY}/${JSONLINT_TAG} -qc grafana/provisioning/dashboards/nexus_host.json
-	docker run --rm -it -v $(PWD):/data ${REGISTRY}/${JSONLINT_TAG} -qc grafana/provisioning/dashboards/nginx_container.json
-	docker run --rm -it -v $(PWD):/data ${REGISTRY}/${JSONLINT_TAG} -qc grafana/provisioning/dashboards/node-exporter.json
-	docker run --rm -it -v $(PWD):/data ${REGISTRY}/${JSONLINT_TAG} -qc grafana/provisioning/dashboards/smart-1.json
-	docker run --rm -it -v $(PWD):/data ${REGISTRY}/${JSONLINT_TAG} -qc grafana/provisioning/dashboards/smart-2.json
-	docker run --rm -it -v $(PWD):/data ${REGISTRY}/${JSONLINT_TAG} -qc grafana/provisioning/dashboards/smart-3.json
-	docker run --rm -it -v $(PWD):/data ${REGISTRY}/${JSONLINT_TAG} -qc grafana/provisioning/dashboards/smart-4.json
+	$(LINT-JSON-CMD) -qc grafana/provisioning/dashboards/docker_containers.json
+	$(LINT-JSON-CMD) -qc grafana/provisioning/dashboards/i-o-statistics.json
+	$(LINT-JSON-CMD) -qc grafana/provisioning/dashboards/monitor_services.json
+	$(LINT-JSON-CMD) -qc grafana/provisioning/dashboards/nexus_host.json
+	$(LINT-JSON-CMD) -qc grafana/provisioning/dashboards/nginx_container.json
+	$(LINT-JSON-CMD) -qc grafana/provisioning/dashboards/node-exporter.json
+	$(LINT-JSON-CMD) -qc grafana/provisioning/dashboards/smart-1.json
+	$(LINT-JSON-CMD) -qc grafana/provisioning/dashboards/smart-2.json
+	$(LINT-JSON-CMD) -qc grafana/provisioning/dashboards/smart-3.json
+	$(LINT-JSON-CMD) -qc grafana/provisioning/dashboards/smart-4.json
 
 restart:
 	docker-compose -f docker-compose.yml down