From f183dc8aead7d2e64eb97e169b89d6cc90d78aa5 Mon Sep 17 00:00:00 2001
From: "Austin S. Hemmelgarn" <austin@netdata.cloud>
Date: Mon, 27 Sep 2021 10:16:39 -0400
Subject: [PATCH] Clean up YAML files in the repository. (#11570)
* Assorted yamllint config updates.
* Extended line length limit to 150. This is still a reasonable limit
but cuts down on warnings a bit.
* Added explicit ignore directives for external repo paths. This makes
using yamllint locally nicer.
* Enabled the rule to require null values to be explicit. This rule
helps prevent accidental bogus mapping problems resulting from
implicit null values combined with incorrect indentation.
This only results in new errors in a couple of GHA workflows, which will
be fixed in the next commit.
* Fix all yamllint warnings in yaml file sin the repo.
Most are indentation or spurious empty lines.
* Fix invalid null value.
---
.codeclimate.yml | 11 +++++------
.github/workflows/build-and-install.yml | 2 +-
.github/workflows/checks.yml | 2 +-
.github/workflows/coverity.yml | 2 +-
.github/workflows/docker.yml | 4 ++--
.github/workflows/packaging.yml | 1 -
.github/workflows/repoconfig-packages.yml | 4 ++--
.github/workflows/review.yml | 2 +-
.yamllint.yml | 14 ++++++++++----
.../scenarios/aclk-testing/agent-compose.yml | 7 +++----
.../aclk-testing/agent-valgrind-compose.yml | 7 +++----
.../scenarios/aclk-testing/paho-compose.yml | 2 +-
.../scenarios/aclk-testing/vernemq-compose.yml | 1 -
build_external/scenarios/gaps_hi/child-compose.yml | 3 +--
.../scenarios/gaps_hi/middle-compose.yml | 2 +-
build_external/scenarios/gaps_lo/child-compose.yml | 1 -
.../scenarios/only-agent/docker-compose.yml | 4 ++--
web/api/netdata-swagger.yaml | 4 ++--
18 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/.codeclimate.yml b/.codeclimate.yml
index 8a11c84a6c..59fb3e7958 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -43,11 +43,11 @@ plugins:
enabled: false
config:
languages:
- - javascript:
- mass_threshold: 100
- - python:
- python_version: 3
- mass_threshold: 100
+ - javascript:
+ mass_threshold: 100
+ - python:
+ python_version: 3
+ mass_threshold: 100
checks:
Similar code:
enabled: false
@@ -96,4 +96,3 @@ exclude_patterns:
- "collectors/node.d.plugin/node_modules/extend.js"
- "collectors/node.d.plugin/node_modules/pixl-xml.js"
- "collectors/node.d.plugin/node_modules/net-snmp.js"
-
diff --git a/.github/workflows/build-and-install.yml b/.github/workflows/build-and-install.yml
index b2a0dc7101..552de6565d 100644
--- a/.github/workflows/build-and-install.yml
+++ b/.github/workflows/build-and-install.yml
@@ -4,7 +4,7 @@ on:
push:
branches:
- master
- pull_request:
+ pull_request: null
env:
DO_NOT_TRACK: 1
jobs:
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 5b5239218b..78f926f42a 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -4,7 +4,7 @@ on:
push:
branches:
- master
- pull_request:
+ pull_request: null
env:
DO_NOT_TRACK: 1
jobs:
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
index ac99d918f0..e8221c7826 100644
--- a/.github/workflows/coverity.yml
+++ b/.github/workflows/coverity.yml
@@ -40,7 +40,7 @@ jobs:
uses: rtCamp/action-slack-notify@v2
env:
SLACK_COLOR: 'danger'
- SLACK_FOOTER:
+ SLACK_FOOTER: ''
SLACK_ICON_EMOJI: ':github-actions:'
SLACK_TITLE: 'Coverity run failed:'
SLACK_USERNAME: 'GitHub Actions'
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 9d20d4653d..63a5fc09c8 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -4,7 +4,7 @@ on:
push:
branches:
- master
- pull_request:
+ pull_request: null
workflow_dispatch:
inputs:
version:
@@ -99,7 +99,7 @@ jobs:
uses: rtCamp/action-slack-notify@v2
env:
SLACK_COLOR: 'danger'
- SLACK_FOOTER:
+ SLACK_FOOTER: ''
SLACK_ICON_EMOJI: ':github-actions:'
SLACK_TITLE: 'Docker Build failed:'
SLACK_USERNAME: 'GitHub Actions'
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
index 59422f5c38..4775c40cc8 100644
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -133,7 +133,6 @@ jobs:
uses: rtCamp/action-slack-notify@v2
env:
SLACK_COLOR: 'danger'
- SLACK_FOOTER:
SLACK_ICON_EMOJI: ':github-actions:'
SLACK_TITLE: 'Package Build failed:'
SLACK_USERNAME: 'GitHub Actions'
diff --git a/.github/workflows/repoconfig-packages.yml b/.github/workflows/repoconfig-packages.yml
index 62fae9e79e..506613ac5b 100644
--- a/.github/workflows/repoconfig-packages.yml
+++ b/.github/workflows/repoconfig-packages.yml
@@ -2,7 +2,7 @@
# Handles building of binary packages for the agent.
name: Repository Packages
on:
- workflow_dispatch:
+ workflow_dispatch: null
env:
DO_NOT_TRACK: 1
jobs:
@@ -60,7 +60,7 @@ jobs:
uses: rtCamp/action-slack-notify@v2
env:
SLACK_COLOR: 'danger'
- SLACK_FOOTER:
+ SLACK_FOOTER: ''
SLACK_ICON_EMOJI: ':github-actions:'
SLACK_TITLE: 'Repository Package Build failed:'
SLACK_USERNAME: 'GitHub Actions'
diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
index a85f1c473f..667fa2b04a 100644
--- a/.github/workflows/review.yml
+++ b/.github/workflows/review.yml
@@ -2,7 +2,7 @@
# Runs various ReviewDog based checks against PR with suggested changes to improve quality
name: Review
on:
- pull_request:
+ pull_request: null
env:
run_eslint: 0
run_hadolint: 0
diff --git a/.yamllint.yml b/.yamllint.yml
index 09d99aa8c7..b05de20626 100644
--- a/.yamllint.yml
+++ b/.yamllint.yml
@@ -6,10 +6,11 @@ yaml-files:
- 'collectors/python.d.plugin/*.conf'
- 'collectors/python.d.plugin/*/*.conf'
+ignore: |
+ mqtt_websockets/
+ packaging/makeself/tmp/
+
rules:
- line-length:
- max: 120
- level: warning
braces: enable
brackets: enable
colons: enable
@@ -19,9 +20,14 @@ rules:
document-end: disable
document-start: disable
empty-lines: enable
- empty-values: disable
+ empty-values: enable
hyphens: enable
indentation: enable
+ line-length:
+ max: 150
+ level: warning
+ allow-non-breakable-words: true
+ allow-non-breakable-inline-mappings: true
key-duplicates: enable
key-ordering: disable
new-line-at-end-of-file: enable
diff --git a/build_external/scenarios/aclk-testing/agent-compose.yml b/build_external/scenarios/aclk-testing/agent-compose.yml
index c05c97cdf2..5f0f19af59 100644
--- a/build_external/scenarios/aclk-testing/agent-compose.yml
+++ b/build_external/scenarios/aclk-testing/agent-compose.yml
@@ -5,8 +5,8 @@ services:
context: ../../..
dockerfile: build_external/make-install.Dockerfile
args:
- - DISTRO=arch
- - VERSION=current
+ - DISTRO=arch
+ - VERSION=current
image: arch_current_dev:latest
command: >
sh -c "echo -n 00000000-0000-0000-0000-000000000000 >/var/lib/netdata/cloud.d/claimed_id &&
@@ -15,5 +15,4 @@ services:
echo ' agent cloud link port = 9002' >>/etc/netdata/netdata.conf &&
/usr/sbin/netdata -D"
ports:
- - 20000:19999
-
+ - 20000:19999
diff --git a/build_external/scenarios/aclk-testing/agent-valgrind-compose.yml b/build_external/scenarios/aclk-testing/agent-valgrind-compose.yml
index d404ed41b9..3173e81e45 100644
--- a/build_external/scenarios/aclk-testing/agent-valgrind-compose.yml
+++ b/build_external/scenarios/aclk-testing/agent-valgrind-compose.yml
@@ -5,8 +5,8 @@ services:
context: ../../..
dockerfile: build_external/make-install.Dockerfile
args:
- - DISTRO=arch
- - VERSION=extras
+ - DISTRO=arch
+ - VERSION=extras
image: arch_extras_dev:latest
command: >
sh -c "echo -n 00000000-0000-0000-0000-000000000000 >/var/lib/netdata/cloud.d/claimed_id &&
@@ -15,5 +15,4 @@ services:
echo ' agent cloud link port = 9002' >>/etc/netdata/netdata.conf &&
/usr/sbin/valgrind --leak-check=full /usr/sbin/netdata -D -W debug_flags=0x200000000"
ports:
- - 20000:19999
-
+ - 20000:19999
diff --git a/build_external/scenarios/aclk-testing/paho-compose.yml b/build_external/scenarios/aclk-testing/paho-compose.yml
index 4fc6ce2c49..8c39e20fc0 100644
--- a/build_external/scenarios/aclk-testing/paho-compose.yml
+++ b/build_external/scenarios/aclk-testing/paho-compose.yml
@@ -3,4 +3,4 @@ services:
paho_inspect:
build:
context: .
- dockerfile: paho.Dockerfile
\ No newline at end of file
+ dockerfile: paho.Dockerfile
diff --git a/build_external/scenarios/aclk-testing/vernemq-compose.yml b/build_external/scenarios/aclk-testing/vernemq-compose.yml
index a9f07a546a..3ec805a740 100644
--- a/build_external/scenarios/aclk-testing/vernemq-compose.yml
+++ b/build_external/scenarios/aclk-testing/vernemq-compose.yml
@@ -4,4 +4,3 @@ services:
build:
dockerfile: configureVerneMQ.Dockerfile
context: .
-
diff --git a/build_external/scenarios/gaps_hi/child-compose.yml b/build_external/scenarios/gaps_hi/child-compose.yml
index e507360930..2ca306f37c 100644
--- a/build_external/scenarios/gaps_hi/child-compose.yml
+++ b/build_external/scenarios/gaps_hi/child-compose.yml
@@ -10,5 +10,4 @@ services:
#- ./child_guid:/var/lib/netdata/registry/netdata.public.unique.id:ro
- ./min.conf:/etc/netdata/netdata.conf:ro
cap_add:
- - SYS_PTRACE
-
+ - SYS_PTRACE
diff --git a/build_external/scenarios/gaps_hi/middle-compose.yml b/build_external/scenarios/gaps_hi/middle-compose.yml
index cb4a045554..c316164dd9 100644
--- a/build_external/scenarios/gaps_hi/middle-compose.yml
+++ b/build_external/scenarios/gaps_hi/middle-compose.yml
@@ -10,4 +10,4 @@ services:
- ./middle_guid:/var/lib/netdata/registry/netdata.public.unique.id:ro
- ./min.conf:/etc/netdata/netdata.conf:ro
cap_add:
- - SYS_PTRACE
+ - SYS_PTRACE
diff --git a/build_external/scenarios/gaps_lo/child-compose.yml b/build_external/scenarios/gaps_lo/child-compose.yml
index dca900c2ef..dee06f2eee 100644
--- a/build_external/scenarios/gaps_lo/child-compose.yml
+++ b/build_external/scenarios/gaps_lo/child-compose.yml
@@ -12,4 +12,3 @@ services:
- ./mostly_off.conf:/etc/netdata/netdata.conf:ro
cap_add:
- SYS_PTRACE
-
diff --git a/build_external/scenarios/only-agent/docker-compose.yml b/build_external/scenarios/only-agent/docker-compose.yml
index 74bdef8e32..eb1386fd54 100644
--- a/build_external/scenarios/only-agent/docker-compose.yml
+++ b/build_external/scenarios/only-agent/docker-compose.yml
@@ -4,5 +4,5 @@ services:
image: ${Distro}_${Version}_dev
command: /usr/sbin/netdata -D
ports:
- - 80
- - 443
+ - 80
+ - 443
diff --git a/web/api/netdata-swagger.yaml b/web/api/netdata-swagger.yaml
index 062aa7ce5f..19f4ded56f 100644
--- a/web/api/netdata-swagger.yaml
+++ b/web/api/netdata-swagger.yaml
@@ -456,7 +456,7 @@ paths:
required: false
allowEmptyValue: true
schema:
- oneOf:
+ oneOf:
- type: string
enum:
- green
@@ -478,7 +478,7 @@ paths:
required: false
allowEmptyValue: true
schema:
- oneOf:
+ oneOf:
- type: string
enum:
- green