Skip to content

Commit

Permalink
Merge branch 'main' into feat/add_silence_datasource
Browse files Browse the repository at this point in the history
  • Loading branch information
Nemental authored Oct 31, 2024
2 parents 1dcea66 + 40d554b commit 4e0cbc1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ansible-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
strategy:
fail-fast: false
matrix:
grafana_version: ["11.2.0", "10.4.8", "9.5.20"]
grafana_version: ["11.3.0", "10.4.11", "9.5.20"]
ansible_version: ["stable-2.15", "stable-2.16", "devel"]
python_version: ["3.11"]
services:
Expand All @@ -67,7 +67,7 @@ jobs:
strategy:
fail-fast: false
matrix:
grafana_version: ["11.2.0", "10.4.8", "9.5.20"]
grafana_version: ["11.3.0", "10.4.11", "9.5.20"]
ansible_version: ["stable-2.15", "stable-2.16", "devel"]
python_version: ["3.11"]
services:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Click on the name of a plugin or module to view that content's documentation:
We aim at keeping the last 3 Major versions of Grafana tested.
This collection is currently testing the modules against following versions of Grafana:
```
grafana_version: ["11.2.0", "10.4.8", "9.5.20"]
grafana_version: ["11.3.0", "10.4.11", "9.5.20"]
```

## Installation and Usage
Expand Down
3 changes: 3 additions & 0 deletions changelogs/fragments/406-python3.12.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
bugfixes:
- "test: replace more deprecated `TestCase.assertEquals` to support Python 3.12"
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def test_create_silence_new_silence(
},
method="POST",
)
self.assertEquals(result, {"silenceID": "470b7116-8f06-4bb6-9e6c-6258aa92218e"})
self.assertEqual(result, {"silenceID": "470b7116-8f06-4bb6-9e6c-6258aa92218e"})

# create a new silence with alertmanager datasource defined
@patch(
Expand Down Expand Up @@ -356,4 +356,4 @@ def test_delete_silence_with_datasource(
},
method="DELETE",
)
self.assertEquals(result, {"message": "silence deleted"})
self.assertEqual(result, {"message": "silence deleted"})

0 comments on commit 4e0cbc1

Please sign in to comment.