From d542c3ad98ee948d39b431f6daf3b9a1a2077f14 Mon Sep 17 00:00:00 2001 From: Jef Spaleta Date: Fri, 20 Nov 2020 16:39:06 -0900 Subject: [PATCH] finish prepping ci namespace --- .../checks/check-cpu.yaml | 6 +++--- .../checks/check-echo.yaml | 6 +++--- .../checks/check-http.yaml | 6 +++--- .../checks/false.yaml | 2 +- .../checks/true.yaml | 2 +- .../filters/fatigue-check.yaml | 0 .../handlers/alert/aws-sns.yaml | 12 ++++++------ .../handlers/alert/pushover.yaml | 8 ++++---- .../handlers/alert/set.yaml | 2 +- .../mutators/check-status.yaml | 0 namespaces.yaml | 5 +++++ 11 files changed, 27 insertions(+), 22 deletions(-) rename ci-namespaces/{test-namespace => ci-namespace}/checks/check-cpu.yaml (98%) rename ci-namespaces/{test-namespace => ci-namespace}/checks/check-echo.yaml (98%) rename ci-namespaces/{test-namespace => ci-namespace}/checks/check-http.yaml (98%) rename ci-namespaces/{test-namespace => ci-namespace}/checks/false.yaml (89%) rename ci-namespaces/{test-namespace => ci-namespace}/checks/true.yaml (89%) rename ci-namespaces/{test-namespace => ci-namespace}/filters/fatigue-check.yaml (100%) rename ci-namespaces/{test-namespace => ci-namespace}/handlers/alert/aws-sns.yaml (94%) rename ci-namespaces/{test-namespace => ci-namespace}/handlers/alert/pushover.yaml (96%) rename ci-namespaces/{test-namespace => ci-namespace}/handlers/alert/set.yaml (79%) rename ci-namespaces/{test-namespace => ci-namespace}/mutators/check-status.yaml (100%) diff --git a/ci-namespaces/test-namespace/checks/check-cpu.yaml b/ci-namespaces/ci-namespace/checks/check-cpu.yaml similarity index 98% rename from ci-namespaces/test-namespace/checks/check-cpu.yaml rename to ci-namespaces/ci-namespace/checks/check-cpu.yaml index c4047bf..d325324 100644 --- a/ci-namespaces/test-namespace/checks/check-cpu.yaml +++ b/ci-namespaces/ci-namespace/checks/check-cpu.yaml @@ -3,7 +3,7 @@ api_version: core/v2 metadata: name: cpu labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: check_hooks: null command: check-cpu.rb @@ -41,7 +41,7 @@ metadata: io.sensu.bonsai.version: 4.1.0 name: sensu-plugins/sensu-plugins-cpu-checks:4.1.0 labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: builds: - filters: @@ -104,7 +104,7 @@ metadata: io.sensu.bonsai.version: 0.0.10 name: sensu/sensu-ruby-runtime:0.0.10 labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: builds: - filters: diff --git a/ci-namespaces/test-namespace/checks/check-echo.yaml b/ci-namespaces/ci-namespace/checks/check-echo.yaml similarity index 98% rename from ci-namespaces/test-namespace/checks/check-echo.yaml rename to ci-namespaces/ci-namespace/checks/check-echo.yaml index 195ba1b..87ab8c9 100644 --- a/ci-namespaces/test-namespace/checks/check-echo.yaml +++ b/ci-namespaces/ci-namespace/checks/check-echo.yaml @@ -3,7 +3,7 @@ api_version: core/v2 metadata: name: echo labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: check_hooks: null command: echo "this is a check prune should delete" @@ -41,7 +41,7 @@ metadata: io.sensu.bonsai.version: 4.1.0 name: sensu-plugins/sensu-plugins-cpu-checks:4.1.0 labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: builds: - filters: @@ -104,7 +104,7 @@ metadata: io.sensu.bonsai.version: 0.0.10 name: sensu/sensu-ruby-runtime:0.0.10 labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: builds: - filters: diff --git a/ci-namespaces/test-namespace/checks/check-http.yaml b/ci-namespaces/ci-namespace/checks/check-http.yaml similarity index 98% rename from ci-namespaces/test-namespace/checks/check-http.yaml rename to ci-namespaces/ci-namespace/checks/check-http.yaml index e9a29ba..16cecd7 100644 --- a/ci-namespaces/test-namespace/checks/check-http.yaml +++ b/ci-namespaces/ci-namespace/checks/check-http.yaml @@ -3,7 +3,7 @@ api_version: core/v2 metadata: name: nginx labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: check_hooks: null command: check-http.rb -u http://localhost -q 'Welcome to CentOS' @@ -41,7 +41,7 @@ metadata: io.sensu.bonsai.version: 6.0.0 name: sensu-plugins/sensu-plugins-http:6.0.0 labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: builds: - filters: @@ -96,7 +96,7 @@ metadata: io.sensu.bonsai.version: 0.0.10 name: sensu/sensu-ruby-runtime:0.0.10 labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: builds: - filters: diff --git a/ci-namespaces/test-namespace/checks/false.yaml b/ci-namespaces/ci-namespace/checks/false.yaml similarity index 89% rename from ci-namespaces/test-namespace/checks/false.yaml rename to ci-namespaces/ci-namespace/checks/false.yaml index f8c40c7..e63bdf0 100644 --- a/ci-namespaces/test-namespace/checks/false.yaml +++ b/ci-namespaces/ci-namespace/checks/false.yaml @@ -3,7 +3,7 @@ api_version: core/v2 metadata: name: test_false labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: command: /usr/bin/false env_vars: null diff --git a/ci-namespaces/test-namespace/checks/true.yaml b/ci-namespaces/ci-namespace/checks/true.yaml similarity index 89% rename from ci-namespaces/test-namespace/checks/true.yaml rename to ci-namespaces/ci-namespace/checks/true.yaml index d15cc6c..b75e93c 100644 --- a/ci-namespaces/test-namespace/checks/true.yaml +++ b/ci-namespaces/ci-namespace/checks/true.yaml @@ -3,7 +3,7 @@ api_version: core/v2 metadata: name: test_true labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: command: /usr/bin/true env_vars: null diff --git a/ci-namespaces/test-namespace/filters/fatigue-check.yaml b/ci-namespaces/ci-namespace/filters/fatigue-check.yaml similarity index 100% rename from ci-namespaces/test-namespace/filters/fatigue-check.yaml rename to ci-namespaces/ci-namespace/filters/fatigue-check.yaml diff --git a/ci-namespaces/test-namespace/handlers/alert/aws-sns.yaml b/ci-namespaces/ci-namespace/handlers/alert/aws-sns.yaml similarity index 94% rename from ci-namespaces/test-namespace/handlers/alert/aws-sns.yaml rename to ci-namespaces/ci-namespace/handlers/alert/aws-sns.yaml index f67d1ac..72ac68c 100644 --- a/ci-namespaces/test-namespace/handlers/alert/aws-sns.yaml +++ b/ci-namespaces/ci-namespace/handlers/alert/aws-sns.yaml @@ -4,7 +4,7 @@ api_version: core/v2 metadata: name: aws-sns labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: command: sensu-aws-sns-handler env_vars: null @@ -31,7 +31,7 @@ api_version: secrets/v1 metadata: name: aws_secret_access_key labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: provider: env id: AWS_SECRET_ACCESS_KEY @@ -41,7 +41,7 @@ api_version: secrets/v1 metadata: name: aws_access_key_id labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: provider: env id: AWS_ACCESS_KEY_ID @@ -51,7 +51,7 @@ api_version: secrets/v1 metadata: name: aws_region labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: provider: env id: AWS_REGION @@ -61,7 +61,7 @@ api_version: secrets/v1 metadata: name: sns_topic_arn labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: provider: env id: SNS_TOPIC_ARN @@ -71,7 +71,7 @@ api_version: core/v2 metadata: name: sensu-aws-sns-handler:0.1.0 labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action annotations: io.sensu.bonsai.url: https://bonsai.sensu.io/assets/nixwiz/sensu-aws-sns-handler io.sensu.bonsai.api_url: https://bonsai.sensu.io/api/v1/assets/nixwiz/sensu-aws-sns-handler diff --git a/ci-namespaces/test-namespace/handlers/alert/pushover.yaml b/ci-namespaces/ci-namespace/handlers/alert/pushover.yaml similarity index 96% rename from ci-namespaces/test-namespace/handlers/alert/pushover.yaml rename to ci-namespaces/ci-namespace/handlers/alert/pushover.yaml index e4f093d..5c9622f 100644 --- a/ci-namespaces/test-namespace/handlers/alert/pushover.yaml +++ b/ci-namespaces/ci-namespace/handlers/alert/pushover.yaml @@ -3,7 +3,7 @@ api_version: core/v2 metadata: name: pushover labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: command: sensu-go-pushover-handler --pushoverToken $PUSHOVER_TOKEN --pushoverUserKey $PUSHOVER_USERKEY env_vars: null @@ -27,7 +27,7 @@ api_version: secrets/v1 metadata: name: pushover_token labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: provider: env id: SENSU_PUSHOVER_TOKEN @@ -37,7 +37,7 @@ api_version: secrets/v1 metadata: name: pushover_userkey labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: provider: env id: SENSU_PUSHOVER_USERKEY @@ -47,7 +47,7 @@ api_version: core/v2 metadata: name: nixwiz/sensu-go-pushover-handler:0.8.0 labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action annotations: io.sensu.bonsai.url: https://bonsai.sensu.io/assets/nixwiz/sensu-go-pushover-handler io.sensu.bonsai.api_url: https://bonsai.sensu.io/api/v1/assets/nixwiz/sensu-go-pushover-handler diff --git a/ci-namespaces/test-namespace/handlers/alert/set.yaml b/ci-namespaces/ci-namespace/handlers/alert/set.yaml similarity index 79% rename from ci-namespaces/test-namespace/handlers/alert/set.yaml rename to ci-namespaces/ci-namespace/handlers/alert/set.yaml index ce8edbe..958b3b8 100644 --- a/ci-namespaces/test-namespace/handlers/alert/set.yaml +++ b/ci-namespaces/ci-namespace/handlers/alert/set.yaml @@ -4,7 +4,7 @@ api_version: core/v2 metadata: name: alert labels: - sensu.io/workflow: sensu_flow + sensu.io/workflow: ci_action spec: handlers: - pushover diff --git a/ci-namespaces/test-namespace/mutators/check-status.yaml b/ci-namespaces/ci-namespace/mutators/check-status.yaml similarity index 100% rename from ci-namespaces/test-namespace/mutators/check-status.yaml rename to ci-namespaces/ci-namespace/mutators/check-status.yaml diff --git a/namespaces.yaml b/namespaces.yaml index 1eb0ef4..febd182 100644 --- a/namespaces.yaml +++ b/namespaces.yaml @@ -3,3 +3,8 @@ type: Namespace api_version: core/v2 spec: name: test-namespace +--- +type: Namespace +api_version: core/v2 +spec: + name: ci-namespace