Skip to content

Commit 733199c

Browse files
committed
CI: Verify support for Grafana 11
1 parent b0273f0 commit 733199c

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
matrix:
2828
os: [ "ubuntu-latest" ]
2929
python-version: [ "3.8", "3.12" ]
30-
grafana-version: [ "6.7.6", "7.5.17", "8.5.27", "9.5.18", "10.3.5", "10.4.1" ]
30+
grafana-version: [ "6.7.6", "7.5.17", "8.5.27", "9.5.18", "10.3.5", "10.4.1", "11.1.0" ]
3131

3232
env:
3333
OS_TYPE: ${{ matrix.os }}

CHANGES.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ grafana-wtf changelog
55

66
in progress
77
===========
8+
- CI: Verify support for Grafana 11
89

910
2024-04-20 0.19.1
1011
=================

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ grafana-wtf
3131
.. |license| image:: https://img.shields.io/pypi/l/grafana-wtf.svg
3232
:target: https://github.com/panodata/grafana-wtf/blob/main/LICENSE
3333

34-
.. |grafana-versions| image:: https://img.shields.io/badge/Grafana-6.x%20--%2010.x-blue.svg
34+
.. |grafana-versions| image:: https://img.shields.io/badge/Grafana-6.x%20--%2011.x-blue.svg
3535
:target: https://github.com/grafana/grafana
3636
:alt: Supported Grafana versions
3737

grafana_wtf/core.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
from tqdm import tqdm
2020
from tqdm.contrib.logging import tqdm_logging_redirect
2121
from urllib3.exceptions import InsecureRequestWarning
22+
from verlib2 import Version
2223

2324
from grafana_wtf import __appname__, __version__
2425
from grafana_wtf.compat import CachedSession
@@ -167,7 +168,10 @@ def scan_snapshots(self):
167168
self.data.snapshots = self.grafana.snapshots.get_dashboard_snapshots()
168169

169170
def scan_notifications(self):
170-
self.data.notifications = self.grafana.notifications.lookup_channels()
171+
if Version(self.grafana.version) < Version("11"):
172+
self.data.notifications = self.grafana.notifications.lookup_channels()
173+
else:
174+
warnings.warn("Notification channel scanning support for Grafana 11 is not implemented yet", UserWarning)
171175

172176
def scan_datasources(self):
173177
log.info("Scanning datasources")

tests/.env

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
#GRAFANA_VERSION=9.5.18
55
#GRAFANA_VERSION=10.1.9
66
#GRAFANA_VERSION=10.3.5
7-
GRAFANA_VERSION=10.4.1
7+
#GRAFANA_VERSION=10.4.1
8+
GRAFANA_VERSION=11.1.0

0 commit comments

Comments
 (0)