diff --git a/CHANGES.rst b/CHANGES.rst index bec7d56..83d4e07 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -16,6 +16,7 @@ in progress behaviour. Thanks, @JensRichnow and @JWCook. - Improve error reporting and exit behavior when connecting to Grafana instance fails. Thanks, @interfan7. +- Set ``User-Agent`` HTTP header like ``grafana-wtf/0.18.0`` 2024-03-07 0.18.0 ================= diff --git a/doc/backlog.rst b/doc/backlog.rst index 8ee443e..7e8e1f7 100644 --- a/doc/backlog.rst +++ b/doc/backlog.rst @@ -10,10 +10,8 @@ Iteration +1 - https://swarm.hiveeyes.org/grafana/dashboards/f/ODVFg50mz/arnas - https://swarm.hiveeyes.org/grafana/dashboards/f/VM-KxXvWk/ruhrgebiet -- [o] Does it croak on play.grafana.org? - [o] Why are there two newlines on stdout output? - [o] Query dashboard edit history by dashboard tag(s) -- [o] Set user agent to ``grafana-wtf`` ************ @@ -94,3 +92,5 @@ Done - [x] Add JSON and YAML output formats for ``find`` subcommand - [x] History: Group edits by dashboard, to be able to count them - [x] History: Add a feature to filter dashboards by ``COUNT(edits) = 1`` +- [x] Does it croak on play.grafana.org? No. +- [x] Set user agent to ``grafana-wtf`` diff --git a/grafana_wtf/core.py b/grafana_wtf/core.py index 684267d..96199e6 100644 --- a/grafana_wtf/core.py +++ b/grafana_wtf/core.py @@ -21,7 +21,7 @@ from tqdm.contrib.logging import tqdm_logging_redirect from urllib3.exceptions import InsecureRequestWarning -from grafana_wtf import __appname__ +from grafana_wtf import __appname__, __version__ from grafana_wtf.model import ( DashboardDetails, DashboardExplorationItem, @@ -103,7 +103,8 @@ def grafana_client_factory(cls, grafana_url, grafana_token=None): verify=verify, ) if cls.session: - cls.session.headers["User-Agent"] = grafana.client.user_agent + user_agent = f"{__appname__}/{__version__}" + cls.session.headers["User-Agent"] = user_agent grafana.client.s = cls.session return grafana diff --git a/setup.py b/setup.py index cb9ca58..14211ba 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ # Output "tabulate>=0.8.5,<0.10", "colored>=1.4.3,<3", - "Pygments>=2.7.4,<3", + "Pygments>=2.15.1,<3", "PyYAML>=5,<7", ]