diff --git a/changelogs/fragments/353-docs-add-influxdb-flux-example.yml b/changelogs/fragments/353-docs-add-influxdb-flux-example.yml new file mode 100644 index 00000000..b3baa1bc --- /dev/null +++ b/changelogs/fragments/353-docs-add-influxdb-flux-example.yml @@ -0,0 +1,3 @@ +--- +trivial: + - grafana_datasource - (docs) add influxdb v2 flux example \ No newline at end of file diff --git a/changelogs/fragments/354-fix-find-grafana-versions.yml b/changelogs/fragments/354-fix-find-grafana-versions.yml new file mode 100644 index 00000000..4ba22771 --- /dev/null +++ b/changelogs/fragments/354-fix-find-grafana-versions.yml @@ -0,0 +1,3 @@ +--- +trivial: + - fix find grafana versions python script comparation diff --git a/changelogs/fragments/355-rm-dashboard-message-argument.yml b/changelogs/fragments/355-rm-dashboard-message-argument.yml new file mode 100644 index 00000000..3f54afa5 --- /dev/null +++ b/changelogs/fragments/355-rm-dashboard-message-argument.yml @@ -0,0 +1,3 @@ +--- +removed_features: + - removed deprecated `message` argument in `grafana_dashboard` diff --git a/hacking/check_fragment.sh b/hacking/check_fragment.sh index bf90cae6..3173b342 100755 --- a/hacking/check_fragment.sh +++ b/hacking/check_fragment.sh @@ -1,7 +1,7 @@ -#!/bin/bash +#!/usr/bin/env bash function fail() { - cat << EOF + cat <10s" tls_ca_cert: "/etc/ssl/certs/ca.pem" +- name: Create influxdbv2 datasource using fluxql + community.grafana.grafana_datasource: + name: "datasource-influxdb-flux" + grafana_url: "https://grafana.company.com" + grafana_user: "admin" + grafana_password: "xxxxxx" + org_id: "1" + ds_type: "influxdb" + ds_url: "https://influx.company.com:8086" + additional_json_data: + version: "Flux" + organization: "organization" + defaultBucket: "bucket" + tlsSkipVerify: false + additional_secure_json_data: + token: "token" + - name: Create postgres datasource community.grafana.grafana_datasource: name: "datasource-postgres" diff --git a/tests/sanity/ignore-2.15.txt b/tests/sanity/ignore-2.15.txt deleted file mode 100644 index 5c82494f..00000000 --- a/tests/sanity/ignore-2.15.txt +++ /dev/null @@ -1,4 +0,0 @@ -plugins/modules/grafana_dashboard.py validate-modules:invalid-argument-name -tests/unit/modules/grafana/grafana_plugin/test_grafana_plugin.py pep8:W291 -hacking/check_fragment.sh shebang -hacking/find_grafana_versions.py shebang diff --git a/tests/sanity/ignore-2.16.txt b/tests/sanity/ignore-2.16.txt deleted file mode 100644 index 5c82494f..00000000 --- a/tests/sanity/ignore-2.16.txt +++ /dev/null @@ -1,4 +0,0 @@ -plugins/modules/grafana_dashboard.py validate-modules:invalid-argument-name -tests/unit/modules/grafana/grafana_plugin/test_grafana_plugin.py pep8:W291 -hacking/check_fragment.sh shebang -hacking/find_grafana_versions.py shebang diff --git a/tests/unit/modules/grafana/grafana_plugin/test_grafana_plugin.py b/tests/unit/modules/grafana/grafana_plugin/test_grafana_plugin.py index ec691a46..7cc04a99 100644 --- a/tests/unit/modules/grafana/grafana_plugin/test_grafana_plugin.py +++ b/tests/unit/modules/grafana/grafana_plugin/test_grafana_plugin.py @@ -21,7 +21,7 @@ def run_command_ls(): def run_command_install_zip(): STDERR = "" STDOUT = """ -installing alexanderzobnin-grafana-zabbix @ +installing alexanderzobnin-grafana-zabbix @ from: /home/grafana//alexanderzobnin-grafana-zabbix-v3.10.5-1-g2219691.zip into: /var/lib/grafana/plugins