From 1e3abfc56e06a22c1bfd33f41eb2350bf6b32603 Mon Sep 17 00:00:00 2001 From: Justin Seiser Date: Wed, 16 Feb 2022 15:22:39 -0500 Subject: [PATCH] adding default --- CHANGELOG.rst | 6 ++++++ README.md | 4 ++-- galaxy.yml | 6 +++--- plugins/modules/grafana_datasource.py | 3 ++- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 77c06f67..ccc7df05 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,7 +3,13 @@ Grafana Collection Release Notes ================================ .. contents:: Topics +v1.3.1 +====== + +Minor Changes +------------- +- community.grafana.grafana_datasource supports aws_auth_type of default. v1.3.0 ====== diff --git a/README.md b/README.md index 47da3fbe..4fa20a5b 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/grafana)](https://codecov.io/gh/ansible-collections/community.grafana) [![All Contributors](https://img.shields.io/badge/all_contributors-15-orange.svg?style=flat-square)](#contributors-) - + This repo hosts the `community.grafana` Ansible Collection. @@ -48,7 +48,7 @@ You can also include it in a `requirements.yml` file and install it via `ansible --- collections: - name: community.grafana - version: 1.2.0 + version: 1.3.1 ``` ### Using modules from the Grafana Collection in your playbooks diff --git a/galaxy.yml b/galaxy.yml index d00804c3..29205208 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -1,10 +1,10 @@ namespace: community name: grafana -version: 1.3.0 +version: 1.3.1 readme: README.md authors: -- Rémi REY (@rrey) -- Thierry Sallé (@seuf) + - Rémi REY (@rrey) + - Thierry Sallé (@seuf) description: Collection allowing to interact with Grafana APIs license_file: LICENSE tags: diff --git a/plugins/modules/grafana_datasource.py b/plugins/modules/grafana_datasource.py index fd0b7309..96a539b6 100644 --- a/plugins/modules/grafana_datasource.py +++ b/plugins/modules/grafana_datasource.py @@ -213,6 +213,7 @@ - keys - credentials - arn + - default type: str aws_default_region: description: @@ -688,7 +689,7 @@ def main(): tsdb_resolution=dict(type='str', default='second', choices=['second', 'millisecond']), sslmode=dict(default='disable', choices=['disable', 'require', 'verify-ca', 'verify-full']), trends=dict(default=False, type='bool'), - aws_auth_type=dict(default='keys', choices=['keys', 'credentials', 'arn']), + aws_auth_type=dict(default='keys', choices=['keys', 'credentials', 'arn', 'default']), aws_default_region=dict(default='us-east-1', choices=['ap-northeast-1', 'ap-northeast-2', 'ap-southeast-1', 'ap-southeast-2', 'ap-south-1', 'ca-central-1', 'cn-north-1', 'cn-northwest-1',