From 9ac9292c3c8023a70144949aef6c465d26327d56 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Mon, 31 May 2021 16:28:56 +0200
Subject: [PATCH] renamed param
---
brian_polling_manager/cli.py | 6 +++---
brian_polling_manager/sensu.py | 8 ++++----
test/conftest.py | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/brian_polling_manager/cli.py b/brian_polling_manager/cli.py
index 48f4e82..f78df64 100644
--- a/brian_polling_manager/cli.py
+++ b/brian_polling_manager/cli.py
@@ -46,7 +46,7 @@ _DEFAULT_CONFIG = {
'https://test-poller-sensu-agent02.geant.org:8080',
'https://test-poller-sensu-agent03.geant.org:8080'
],
- 'token': '696a815c-607e-4090-81de-58988c83033e',
+ 'api-key': '696a815c-607e-4090-81de-58988c83033e',
'interface-check': {
'script': '/var/lib/sensu/bin/counter2influx.sh',
'measurement': 'counters',
@@ -103,10 +103,10 @@ CONFIG_SCHEMA = {
'items': {'type': 'string'},
'minItems': 1
},
- 'token': {'type': 'string'},
+ 'api-key': {'type': 'string'},
'interface-check': {'$ref': '#/definitions/influx-check'}
},
- 'required': ['api-base', 'token', 'interface-check'],
+ 'required': ['api-base', 'api-key', 'interface-check'],
'additionalProperties': False
},
'statsd': {
diff --git a/brian_polling_manager/sensu.py b/brian_polling_manager/sensu.py
index 18c6b98..0c60d09 100644
--- a/brian_polling_manager/sensu.py
+++ b/brian_polling_manager/sensu.py
@@ -13,7 +13,7 @@ def load_all_checks(params, namespace='default'):
r = requests.get(
f'{url}/api/core/v2/namespaces/{namespace}/checks',
headers={
- 'Authorization': f'Key {params["token"]}',
+ 'Authorization': f'Key {params["api-key"]}',
'Accepts': 'application/json',
})
r.raise_for_status()
@@ -28,7 +28,7 @@ def create_check(params, check, namespace='default'):
r = requests.post(
f'{url}/api/core/v2/namespaces/{namespace}/checks',
headers={
- 'Authorization': f'Key {params["token"]}',
+ 'Authorization': f'Key {params["api-key"]}',
'Content-Type': 'application/json',
},
json=check)
@@ -42,7 +42,7 @@ def update_check(params, check, namespace='default'):
r = requests.put(
f'{url}/api/core/v2/namespaces/{namespace}/checks/{name}',
headers={
- 'Authorization': f'Key {params["token"]}',
+ 'Authorization': f'Key {params["api-key"]}',
'Content-Type': 'application/json',
},
json=check)
@@ -58,5 +58,5 @@ def delete_check(params, check, namespace='default'):
url = random.choice(params['api-base'])
r = requests.delete(
f'{url}/api/core/v2/namespaces/{namespace}/checks/{name}',
- headers={'Authorization': f'Key {params["token"]}'})
+ headers={'Authorization': f'Key {params["api-key"]}'})
r.raise_for_status()
diff --git a/test/conftest.py b/test/conftest.py
index f86f451..9244fd8 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -32,7 +32,7 @@ def config():
'https://bogus-sensu02.xxx.yyy:12345',
'https://bogus-sensu03.xxx.yyy:12345'
],
- 'token': 'abc-token-blah-blah',
+ 'api-key': 'abc-sensu-key-blah-blah',
'interface-check': {
'script': '/var/lib/sensu/bin/counter2influx.sh',
'measurement': 'counters',
--
GitLab