feat: telekom-mms.grafana role

.config/ansible-lint.yml

@@ -0,0 +1,5 @@
+---
+exclude_paths:
+  - .github/
+  - tests/
+  - changelogs/

.config/yamllint/config

@@ -0,0 +1,2 @@
+---
+extends: default

.github/workflows/ansible-test.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         python_version: ["3.10"]
-        ansible_version: ["stable-2.13", "stable-2.14", "devel"]
+        ansible_version: ["stable-2.15", "stable-2.16", "devel"]
     steps:
       - name: Perform testing
         uses: ansible-community/ansible-test-gh-action@release/v1
@@ -30,7 +30,7 @@ jobs:
     strategy:
       matrix:
         python_version: ["3.10"]
-        ansible_version: ["stable-2.13", "stable-2.14", "devel"]
+        ansible_version: ["stable-2.15", "stable-2.16", "devel"]
     steps:
       - name: Perform testing
         uses: ansible-community/ansible-test-gh-action@release/v1
@@ -46,7 +46,7 @@ jobs:
       fail-fast: false
       matrix:
         grafana_version: ["9.5.14", "8.5.27", "10.2.2"]
-        ansible_version: ["stable-2.13", "stable-2.14", "devel"]
+        ansible_version: ["stable-2.15", "stable-2.16", "devel"]
         python_version: ["3.10"]
     services:
       grafana:
@@ -58,3 +58,37 @@ jobs:
           ansible-core-version: ${{ matrix.ansible_version }}
           target-python-version: ${{ matrix.python_version }}
           testing-type: integration
+
+  molecule:
+    runs-on: ubuntu-latest
+    env:
+      PY_COLORS: 1
+      ANSIBLE_FORCE_COLOR: 1
+    strategy:
+      fail-fast: false
+      matrix:
+        grafana_version: ["9.5.14", "8.5.27", "10.2.2"]
+        ansible_version: ["stable-2.15", "stable-2.16", "devel"]
+        python_version: ["3.10"]
+    services:
+      grafana:
+        image: grafana/grafana:${{ matrix.grafana_version }}
+        ports: ["3000:3000"]
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python_version }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --no-cache-dir --upgrade pip
+          pip install "git+https://github.com/ansible/ansible@${{ matrix.ansible_version }}" molecule molecule-docker
+
+      - name: Test with molecule
+        run: |
+          molecule --version
+          molecule test

.github/workflows/lint.yml

@@ -27,3 +27,10 @@ jobs:
         uses: chartboost/ruff-action@v1
         with:
           src: ${{ steps.changed-files.outputs.all_changed_files }}
+  ansible:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Run ansible-lint
+        uses: ansible/ansible-lint@main

README.md

@@ -121,45 +121,6 @@ In your playbooks, you can set [module defaults](https://github.com/ansible/ansi
         is_admin: true
 ```
 
-## Complementary Collection: [`telekom-mms.grafana`](https://github.com/telekom-mms/ansible-role-grafana)
-
-The `telekom-mms.grafana` collection is an Ansible Collection that simplifies the use of the `community.grafana` collection. It provides an Ansible Role for easy integration with `community.grafana`. With this collection, you only need to define the variables for your Grafana resources.
-
-### Requirements
-    ansible-galaxy collection install telekom-mms.grafana
-... or use a requirements.yml:  
-`ansible-galaxy collection install -r requirements.yml`
-```yaml
----
-collections:
-  - name: telekom-mms.grafana
-```
-
-### Example Playbook
-```yaml
----
-- hosts: localhost
-  gather_facts: false
-  connection: local
-
-  vars:
-    grafana_url: "https://grafana.company.com"
-    grafana_user: "admin"
-    grafana_password: "xxxxxx"
-
-    grafana_datasources:
-      - name: "Loki"
-        ds_type: "loki"
-        ds_url: "http://127.0.0.1:3100"
-        tls_skip_verify: yes
-    grafana_folders:
-      - name: my_service
-      - name: other_service
-
-  roles:
-    - role: telekom-mms.grafana
-```
-
 ## Testing and Development
 
 If you want to develop new content for this collection or improve what's already here, the easiest way to work on the collection is to clone it into one of the configured [`COLLECTIONS_PATHS`](https://docs.ansible.com/ansible/latest/reference_appendices/config.html#collections-paths), and work on it there.

changelogs/fragments/343-telekom-mms-role.yml

@@ -0,0 +1,2 @@
+minor_changes:
+  - Merged ansible role telekom-mms/ansible-role-grafana into ansible-collections/community.grafana

codecov.yml

@@ -3,4 +3,4 @@ coverage:
   round: down
   range: "70...100"
 fixes:
-   - "/ansible_collections/community/grafana/::"
+  - "/ansible_collections/community/grafana/::"

meta/runtime.yml

@@ -1,5 +1,5 @@
 ---
-requires_ansible: ">=2.9.0"
+requires_ansible: ">=2.14.0"
 action_groups:
   grafana:
     - grafana_dashboard

molecule/default/converge.yml

@@ -0,0 +1,48 @@
+---
+- name: Converge
+  hosts: localhost
+  environment:
+    http_proxy: "{{ lookup('env', 'HTTP_PROXY') | default(omit)  }}"
+    https_proxy: "{{ lookup('env', 'HTTPS_PROXY') | default(omit) }}"
+    no_proxy: "{{ lookup('env', 'NO_PROXY') | default(omit) }}"
+
+  vars:
+    grafana_url: http://localhost:3000
+    grafana_username: admin
+    grafana_password: admin
+
+    grafana_organizations:
+      - name: my_org
+
+    grafana_datasources:
+      - name: Loki
+        ds_type: loki
+        ds_url: http://127.0.0.1:3100
+        tls_skip_verify: true
+
+    grafana_folders:
+      - name: my_service
+      - name: other_service
+
+    grafana_teams:
+      - name: my_team
+        email: [email protected]
+
+    grafana_users:
+      - name: Test User
+        login: testuser
+        password: supersecure!123
+        email: [email protected]
+
+    grafana_organization_users:
+      - login: testuser
+        org_id: 1
+      - login: testuser
+        org_name: my_org
+
+    grafana_dashboards:
+      - folder: my_service
+        path: test_dashboard.json
+        overwrite: true
+
+  roles: [{role: community.grafana.grafana}]

molecule/default/molecule.yml

@@ -0,0 +1,21 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+platforms:
+  - name: instance
+    image: rndmh3ro/docker-debian12-ansible:latest
+    command: ${MOLECULE_DOCKER_COMMAND:-/lib/systemd/systemd}
+    env:
+      container: docker
+    pre_build_image: true
+    platform: amd64
+provisioner:
+  name: ansible
+  config_options:
+    defaults:
+      interpreter_python: auto_silent
+      callback_whitelist: profile_tasks, timer, yaml
+verifier:
+  name: ansible

molecule/default/test_dashboard.json

@@ -0,0 +1,126 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "-- Grafana --",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": 3,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": {
+        "type": "loki"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 0
+      },
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "loki"
+          },
+          "refId": "A"
+        }
+      ],
+      "title": "Panel Title",
+      "type": "timeseries"
+    }
+  ],
+  "refresh": "",
+  "schemaVersion": 33,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-6h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "New dashboard",
+  "uid": "ES5apb27k",
+  "version": 1,
+  "weekStart": ""
+}