Merge branch 'main' into fixes-graafana-dashboards

Author: ishanjainn

CHANGELOG.rst

@@ -4,6 +4,13 @@ Grafana.Grafana Release Notes
 
 .. contents:: Topics
 
+v6.0.1
+======
+
+Minor Changes
+-------------
+- Remove Node modules from Ansible Collection build
+
 v6.0.0
 ======
 

changelogs/changelog.yaml

@@ -370,3 +370,7 @@ releases:
       - integrate sles legacy init-script support by @floerica in https://github.com/grafana/grafana-ansible-collection/pull/184
       - feat: add user module to create/update/delete grafana users by @mvalois in https://github.com/grafana/grafana-ansible-collection/pull/178
       - management of the config.river with the conversion of the config.yaml by @lbrule in https://github.com/grafana/grafana-ansible-collection/pull/149
+  6.0.1:
+    changes:
+      minor_changes:
+      - Remove Node modules from Ansible Collection build

galaxy.yml

@@ -1,7 +1,7 @@
 ---
 namespace: grafana
 name: grafana
-version: 6.0.0
+version: 6.0.1
 readme: README.md
 authors:
   - Grafana Labs <grafana.com>
@@ -14,3 +14,5 @@ tags: [grafana, observability, monitoring]
 repository: https://github.com/grafana/grafana-ansible-collection
 issues: https://github.com/grafana/grafana-ansible-collection/issues
 documentation: https://docs.ansible.com/ansible/latest/collections/grafana/grafana/index.html
+build_ignore:
+- node_modules/*

roles/grafana/tasks/main.yml

@@ -129,4 +129,4 @@
         - grafana_configure
         - grafana_dashboards
         - grafana_run
-  when: "grafana_dashboards | length > 0 or __found_dashboards | length > 0"
+  when: "grafana_dashboards | length > 0 or __found_dashboards['files'] | length > 0"

roles/mimir/tasks/deploy.yml

@@ -101,7 +101,7 @@
 
 - name: Verify that Mimir URL is responding
   ansible.builtin.uri:
-    url: "http://127.0.0.1:{{ mimir_http_listen_port }}/ready"
+    url: "http://{{ mimir_http_listen_address }}:{{ mimir_http_listen_port }}/ready"
     method: GET
   register: mimir_verify_url_status_code
   retries: 5

roles/opentelemetry_collector/tasks/configure.yml

@@ -14,6 +14,6 @@
     owner: "{{ otel_collector_service_user }}"
     group: "{{ otel_collector_service_group }}"
     mode: '0644'
-    validate: '{{ otel_collector_installation_dir }}/{{ otel_collector_executable }} --config={{ otel_collector_config_dir }}/{{ otel_collector_config_file }} validate'
+    validate: '{{ otel_collector_installation_dir }}/{{ otel_collector_executable }} --config=%s validate'
   notify: Restart OpenTelemetry Collector
   become: true