From 31483e28474895b4c0a93bae87425c0dcf254975 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Wed, 14 Feb 2024 16:31:15 +0200 Subject: [PATCH 01/22] grafanaPlugins: modify the update script to work for all systems This also now grabs checksums off the API which saves on downloads and such. --- .../grafana/plugins/update-grafana-plugin.sh | 44 +++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh b/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh index dd8f050c633c..db1463c7333c 100755 --- a/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh +++ b/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh @@ -1,8 +1,46 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq common-updater-scripts +#!nix-shell -i bash -p nix curl jq common-updater-scripts set -eu -o pipefail +cd "${0%/*}"/../../../../../ + + readonly plugin_name="$1" -readonly latest_version="$(curl "https://grafana.com/api/plugins/${plugin_name}" | jq -r .version)" -update-source-version "grafanaPlugins.${plugin_name}" "$latest_version" +readonly api_response="$(curl --silent "https://grafana.com/api/plugins/${plugin_name}")" +readonly latest_version="$(echo "$api_response" | jq -r .version)" + +update() { + local system="${2:+--system=$2}" + local pkg="$(echo "$api_response" | jq -e .packages.\""$1"\")" + if echo "$pkg" | jq -er .sha256 > /dev/null; then + local hash="$(echo "$pkg" | jq -er .sha256)" + else + # Some packages only have an md5 hash. Download the file for hash computation. + local urlPath="$(echo "$pkg" | jq -er .downloadUrl)" + local hash="$(nix-prefetch-url --type sha256 --name "$plugin_name" "https://grafana.com$urlPath")" + fi + hash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$hash")" + # Set version number to a random number first to force update to happen. + # + # `update-source-version` will exit early if it considers the version number to be the same. + # However we have already downloaded the file and computed the hash, so it makes sense to set + # the newly computed information unconditionally. + # + # As an example of a workflow that was made more complicated than strictly necessary is my own + # attempts to improve this script where I spent multiple hours investigating why the update + # script would refuse to update a hash that I intentionally malformed (in hopes to test the + # operation of this script.) + update-source-version $system "grafanaPlugins.${plugin_name}" $RANDOM "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" + update-source-version $system "grafanaPlugins.${plugin_name}" "$latest_version" "$hash" +} + +if echo "$api_response" | jq -e .packages.any > /dev/null; then + # the package contains an "any" package, so there should be only one zipHash. + update "any" +else + update "linux-amd64" "x86_64-linux" + update "linux-arm64" "aarch64-linux" + update "darwin-amd64" "x86_64-darwin" + update "darwin-arm64" "aarch64-darwin" +fi From 6834e254a4bd7039c074a4bd4126bc0d504f859a Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:44:08 +0300 Subject: [PATCH 02/22] grafanaPlugins.grafana-clickhouse-datasource: 3.3.0 -> 4.4.0 --- .../plugins/grafana-clickhouse-datasource/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix index 2ebc9834e27b..b80f1bedcaa1 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix @@ -2,12 +2,12 @@ grafanaPlugin rec { pname = "grafana-clickhouse-datasource"; - version = "3.3.0"; + version = "4.4.0"; zipHash = { - x86_64-linux = "sha256-FkOX/2vPmLtxe/oOISldlVhayy7AwfFxLeiwJ5TNgYY="; - aarch64-linux = "sha256-4rCj+NaKPZbuVohlKmSf1M6n5ng9HZMrwzBCgLPdiok="; - x86_64-darwin = "sha256-bpey6EwwAqXgxjvjJ6ou4rinidHCpUr+Z89YpAZK7z8="; - aarch64-darwin = "sha256-u/U2lu4szf9JFt/zfhGmWKH2OUqpJDNaSI69EDdi1+w="; + x86_64-linux = "sha256-rh+oTJrW7WxLHG7jSkT1Pog+/tqhE+j/0jdbgaHu1a4="; + aarch64-linux = "sha256-uV+WKh3/jBgOwX2lrwC3Q7TGr3/BH83QZhwmtL4G3qo="; + x86_64-darwin = "sha256-Y6Xp4HCYF+Nkw8CNrfEMOtpNgKunMI/4oVqD8Wq5VEI="; + aarch64-darwin = "sha256-x/Z5BA9N5sZurQ5K1NQCYXQPZ/yF1p/372GPIeVU0ps="; }; meta = with lib; { description = "Connects Grafana to ClickHouse"; From 198ecdddd7a81cf39272993341c8df6acadb17cb Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:44:30 +0300 Subject: [PATCH 03/22] grafanaPlugins.grafana-clock-panel: 2.1.3 -> 2.1.8 --- .../grafana/plugins/grafana-clock-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix index 61704eaaef34..0165770335f7 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clock-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafana-clock-panel"; - version = "2.1.3"; - zipHash = "sha256-ZedeV/SQsBu55jAxFyyXQefir4hEl1/TQDmaTJN9bag="; + version = "2.1.8"; + zipHash = "sha256-QLvq2CSlJuEaYAazn8MoY3XCiXeRILj4dTp/aqrHL/k="; meta = with lib; { description = "Clock panel for Grafana"; license = licenses.mit; From 6a6de85a75776c2342f18476906f18cbbf989393 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:44:50 +0300 Subject: [PATCH 04/22] grafanaPlugins.grafana-oncall-app: v1.8.5 -> 1.10.2 --- .../grafana/plugins/grafana-oncall-app/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix index a1d67c5283a5..8767f2b51e88 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix @@ -2,9 +2,8 @@ grafanaPlugin { pname = "grafana-oncall-app"; - versionPrefix = "v"; - version = "1.8.5"; - zipHash = "sha256-HuZYHPTWm0EPKQbmapALK2j+PzM+J7gcWM9w8vU2yI0="; + version = "1.10.2"; + zipHash = "sha256-wRgzdPKSA24O4kSDhaO/09uOG6lIoJGWUGOgX1vdjlU="; meta = with lib; { description = "Developer-friendly incident response for Grafana"; license = licenses.agpl3Only; From 6cef6381ee7f7de357ac0c80025a9f745aa0339e Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:45:12 +0300 Subject: [PATCH 05/22] grafanaPlugins.grafana-polystat-panel: 2.1.4 -> 2.1.13 --- .../grafana/plugins/grafana-polystat-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix index ff06ec2137bd..05c59191dc9b 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafana-polystat-panel"; - version = "2.1.4"; - zipHash = "sha256-15mi5NzbbWXJ/69VEwUS058atQ+z2g4C3T9/b+/Exwk="; + version = "2.1.13"; + zipHash = "sha256-O8YOSVLhJ1hDNbBHKwkikNBOjQTrGofGklVTalgDH4I="; meta = with lib; { description = "Hexagonal multi-stat panel for Grafana"; license = licenses.asl20; From aaf91192fb223acacfbe8b33ef03ea12417a8d56 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:46:17 +0300 Subject: [PATCH 06/22] grafanaPlugins.bsull-console-datasource: init at 1.0.1 --- .../plugins/bsull-console-datasource/default.nix | 13 +++++++++++++ pkgs/servers/monitoring/grafana/plugins/plugins.nix | 1 + 2 files changed, 14 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/bsull-console-datasource/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/bsull-console-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/bsull-console-datasource/default.nix new file mode 100644 index 000000000000..30f38f1c4ae4 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/bsull-console-datasource/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "bsull-console-datasource"; + version = "1.0.1"; + zipHash = "sha256-V6D/VIdwwQvG21nVMXD/xF86Uy8WRecL2RjyDTZr1wQ="; + meta = with lib; { + description = "This is a streaming Grafana data source which can connect to the Tokio console subscriber."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 94352fc12210..8e08d316f953 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -4,6 +4,7 @@ grafanaPlugin = callPackage ./grafana-plugin.nix { }; + bsull-console-datasource = callPackage ./bsull-console-datasource { }; doitintl-bigquery-datasource = callPackage ./doitintl-bigquery-datasource { }; grafadruid-druid-datasource = callPackage ./grafadruid-druid-datasource { }; grafana-clickhouse-datasource = callPackage ./grafana-clickhouse-datasource { }; From 4a6dda0693cdc7187fcdfc6a69c3ee47c12ffb5d Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:47:01 +0300 Subject: [PATCH 07/22] grafanaPlugins.fetzerch-sunandmoon-datasource: init at 0.3.3 --- .../fetzerch-sunandmoon-datasource/default.nix | 13 +++++++++++++ pkgs/servers/monitoring/grafana/plugins/plugins.nix | 1 + 2 files changed, 14 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/fetzerch-sunandmoon-datasource/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/fetzerch-sunandmoon-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/fetzerch-sunandmoon-datasource/default.nix new file mode 100644 index 000000000000..3c1c3410f248 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/fetzerch-sunandmoon-datasource/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "fetzerch-sunandmoon-datasource"; + version = "0.3.3"; + zipHash = "sha256-IJe1OiPt9MxqqPymuH0K27jToSb92M0P4XGZXvk0paE="; + meta = with lib; { + description = "SunAndMoon is a Datasource Plugin for Grafana that calculates the position of Sun and Moon as well as the Moon illumination using SunCalc."; + license = licenses.mit; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 8e08d316f953..d72a4455c055 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -6,6 +6,7 @@ bsull-console-datasource = callPackage ./bsull-console-datasource { }; doitintl-bigquery-datasource = callPackage ./doitintl-bigquery-datasource { }; + fetzerch-sunandmoon-datasource = callPackage ./fetzerch-sunandmoon-datasource { }; grafadruid-druid-datasource = callPackage ./grafadruid-druid-datasource { }; grafana-clickhouse-datasource = callPackage ./grafana-clickhouse-datasource { }; grafana-clock-panel = callPackage ./grafana-clock-panel { }; From f5ba4f802330690b52908cabd13e63f103b3b959 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:47:37 +0300 Subject: [PATCH 08/22] grafanaPlugins.frser-sqlite-datasource: init at 3.5.0 --- .../plugins/frser-sqlite-datasource/default.nix | 13 +++++++++++++ pkgs/servers/monitoring/grafana/plugins/plugins.nix | 1 + 2 files changed, 14 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix new file mode 100644 index 000000000000..ba3733860526 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "frser-sqlite-datasource"; + version = "3.5.0"; + zipHash = "sha256-BwAurFpMyyR318HMzVXCnOEQWM8W2vPPisXhhklFLBY="; + meta = with lib; { + description = "This is a Grafana backend plugin to allow using an SQLite database as a data source. The SQLite database needs to be accessible to the filesystem of the device where Grafana itself is running."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index d72a4455c055..5d7ced733e2f 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -7,6 +7,7 @@ bsull-console-datasource = callPackage ./bsull-console-datasource { }; doitintl-bigquery-datasource = callPackage ./doitintl-bigquery-datasource { }; fetzerch-sunandmoon-datasource = callPackage ./fetzerch-sunandmoon-datasource { }; + frser-sqlite-datasource = callPackage ./frser-sqlite-datasource { }; grafadruid-druid-datasource = callPackage ./grafadruid-druid-datasource { }; grafana-clickhouse-datasource = callPackage ./grafana-clickhouse-datasource { }; grafana-clock-panel = callPackage ./grafana-clock-panel { }; From bef04b44087290e19a65af5daeecdbc23b317814 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:48:11 +0300 Subject: [PATCH 09/22] grafanaPlugins.grafana-discourse-datasource: init at 2.0.2 --- .../grafana-discourse-datasource/default.nix | 13 +++++++++++++ pkgs/servers/monitoring/grafana/plugins/plugins.nix | 1 + 2 files changed, 14 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/grafana-discourse-datasource/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-discourse-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-discourse-datasource/default.nix new file mode 100644 index 000000000000..a1250b353cf9 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-discourse-datasource/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "grafana-discourse-datasource"; + version = "2.0.2"; + zipHash = "sha256-0MTxPe7RJHMA0SwjOcFlbi4VkhlLUFP+5r2DsHAaffc="; + meta = with lib; { + description = "The Discourse data source plugin allows users to search and view topics, posts, users, tags, categories, and reports on a given Discourse forum."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 5d7ced733e2f..ea3c895f23fa 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -11,6 +11,7 @@ grafadruid-druid-datasource = callPackage ./grafadruid-druid-datasource { }; grafana-clickhouse-datasource = callPackage ./grafana-clickhouse-datasource { }; grafana-clock-panel = callPackage ./grafana-clock-panel { }; + grafana-discourse-datasource = callPackage ./grafana-discourse-datasource { }; grafana-oncall-app = callPackage ./grafana-oncall-app { }; grafana-piechart-panel = callPackage ./grafana-piechart-panel { }; grafana-polystat-panel = callPackage ./grafana-polystat-panel { }; From 83abd0e7dca5c6853c9ebfec235b883fd5a687f9 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:48:42 +0300 Subject: [PATCH 10/22] grafanaPlugins.grafana-github-datasource: init at 1.9.0 --- .../grafana-github-datasource/default.nix | 18 ++++++++++++++++++ .../monitoring/grafana/plugins/plugins.nix | 1 + 2 files changed, 19 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix new file mode 100644 index 000000000000..f76beec1866f --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-github-datasource/default.nix @@ -0,0 +1,18 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "grafana-github-datasource"; + version = "1.9.0"; + zipHash = { + x86_64-linux = "sha256-DQKb8VKa41bL6D9DN8OpL3sqBIlRCa1zgIjduD6AcQc="; + aarch64-linux = "sha256-RHFURMnBF14QCZhVxZQO3JJ3OP6JXD2Hfef8IyVOgBs="; + x86_64-darwin = "sha256-UBwc8CZRRHsEKpzTgn5PNXjxLzETyWKGsDFtXZnkRW4="; + aarch64-darwin = "sha256-xgQ7s3QP7Sq8ni0n54NE/nYlyALIESfXNKncruAWty0="; + }; + meta = with lib; { + description = "The GitHub datasource allows GitHub API data to be visually represented in Grafana dashboards."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index ea3c895f23fa..82c8a14d81fa 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -12,6 +12,7 @@ grafana-clickhouse-datasource = callPackage ./grafana-clickhouse-datasource { }; grafana-clock-panel = callPackage ./grafana-clock-panel { }; grafana-discourse-datasource = callPackage ./grafana-discourse-datasource { }; + grafana-github-datasource = callPackage ./grafana-github-datasource { }; grafana-oncall-app = callPackage ./grafana-oncall-app { }; grafana-piechart-panel = callPackage ./grafana-piechart-panel { }; grafana-polystat-panel = callPackage ./grafana-polystat-panel { }; From 14a79288d9eb1eb3333482f21ea46441073202a3 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:49:10 +0300 Subject: [PATCH 11/22] grafanaPlugins.grafana-googlesheets-datasource: init at 1.2.14 --- .../default.nix | 18 ++++++++++++++++++ .../monitoring/grafana/plugins/plugins.nix | 1 + 2 files changed, 19 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix new file mode 100644 index 000000000000..4e258eb81378 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-googlesheets-datasource/default.nix @@ -0,0 +1,18 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "grafana-googlesheets-datasource"; + version = "1.2.14"; + zipHash = { + x86_64-linux = "sha256-N4JZ/aWpvezR9daJKU559GXd+FNGmDA4P9CrlC4RFmQ="; + aarch64-linux = "sha256-HZhyg6NhptFib/3JJ8AnSywF+eaZOwiCij3TlMB0YG8="; + x86_64-darwin = "sha256-EwE6w67ARVp/2GE9pSqaD5TuBnsgwsDLZCrEXPfRfUE="; + aarch64-darwin = "sha256-3UGd/t1k6aZsKsQCplLV9klmjQAga19VaopHx330xUs="; + }; + meta = with lib; { + description = "The Grafana JSON Datasource plugin empowers you to seamlessly integrate JSON data into Grafana."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 82c8a14d81fa..fcc45be67776 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -13,6 +13,7 @@ grafana-clock-panel = callPackage ./grafana-clock-panel { }; grafana-discourse-datasource = callPackage ./grafana-discourse-datasource { }; grafana-github-datasource = callPackage ./grafana-github-datasource { }; + grafana-googlesheets-datasource = callPackage ./grafana-googlesheets-datasource { }; grafana-oncall-app = callPackage ./grafana-oncall-app { }; grafana-piechart-panel = callPackage ./grafana-piechart-panel { }; grafana-polystat-panel = callPackage ./grafana-polystat-panel { }; From 4b3ddf490d8045a9fadd759f75ba8b0ed1ef1426 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:49:40 +0300 Subject: [PATCH 12/22] grafanaPlugins.grafana-mqtt-datasource: init at 1.1.0-beta.2 --- .../grafana-mqtt-datasource/default.nix | 18 ++++++++++++++++++ .../monitoring/grafana/plugins/plugins.nix | 1 + 2 files changed, 19 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix new file mode 100644 index 000000000000..e132e831fc66 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-mqtt-datasource/default.nix @@ -0,0 +1,18 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "grafana-mqtt-datasource"; + version = "1.1.0-beta.2"; + zipHash = { + x86_64-linux = "sha256-QYv+6zDLSYiB767A3ODgZ1HzPd7Hpa90elKDV1+dNx8="; + aarch64-linux = "sha256-cquaTD3e40vj7PuQDHvODHOpXeWx3AaN6Mv+Vu+ikbI="; + x86_64-darwin = "sha256-PZmUkghYawU5aKA536u3/LCzsvkIFVJIzl1FVWcrKTI="; + aarch64-darwin = "sha256-9FP7UbNI4q4nqRTzlNKcEPnJ9mdqzOL4E0nuEAdFNJw="; + }; + meta = with lib; { + description = "The MQTT data source plugin allows you to visualize streaming MQTT data from within Grafana."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index fcc45be67776..1c7f04502fe7 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -14,6 +14,7 @@ grafana-discourse-datasource = callPackage ./grafana-discourse-datasource { }; grafana-github-datasource = callPackage ./grafana-github-datasource { }; grafana-googlesheets-datasource = callPackage ./grafana-googlesheets-datasource { }; + grafana-mqtt-datasource = callPackage ./grafana-mqtt-datasource { }; grafana-oncall-app = callPackage ./grafana-oncall-app { }; grafana-piechart-panel = callPackage ./grafana-piechart-panel { }; grafana-polystat-panel = callPackage ./grafana-polystat-panel { }; From 0ab0fe0fc70e9a931bc7acbed4a0b6718d040900 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:50:20 +0300 Subject: [PATCH 13/22] grafanaPlugins.grafana-opensearch-datasource: init at 2.19.0 --- .../grafana-opensearch-datasource/default.nix | 18 ++++++++++++++++++ .../monitoring/grafana/plugins/plugins.nix | 1 + 2 files changed, 19 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix new file mode 100644 index 000000000000..3a5955efcb4c --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-opensearch-datasource/default.nix @@ -0,0 +1,18 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "grafana-opensearch-datasource"; + version = "2.19.0"; + zipHash = { + x86_64-linux = "sha256-jTeiIbaM2wPBTxFyXPQhBXxxzgRZbaXkqeN9+tHgWPc="; + aarch64-linux = "sha256-8ti5CibWbycAO9o3Wse/CuE07JjwV1Quhy/Vm6BDmyM="; + x86_64-darwin = "sha256-6rqdTsYcqjqcXtM20ekJguT42w5dr4EUHvNuRDIU6k0="; + aarch64-darwin = "sha256-Z4ISwwkFJXXdVcLOspAK8euI4yor4Ii08K7zZffY9tM="; + }; + meta = with lib; { + description = "The Grafana JSON Datasource plugin empowers you to seamlessly integrate JSON data into Grafana."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 1c7f04502fe7..0da18cf81461 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -16,6 +16,7 @@ grafana-googlesheets-datasource = callPackage ./grafana-googlesheets-datasource { }; grafana-mqtt-datasource = callPackage ./grafana-mqtt-datasource { }; grafana-oncall-app = callPackage ./grafana-oncall-app { }; + grafana-opensearch-datasource = callPackage ./grafana-opensearch-datasource { }; grafana-piechart-panel = callPackage ./grafana-piechart-panel { }; grafana-polystat-panel = callPackage ./grafana-polystat-panel { }; grafana-worldmap-panel = callPackage ./grafana-worldmap-panel { }; From f8d3ae98e62c581c3515f100861966c87e09e919 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:50:51 +0300 Subject: [PATCH 14/22] grafanaPlugins.marcusolsson-calendar-panel: init at 3.7.0 --- .../plugins/marcusolsson-calendar-panel/default.nix | 13 +++++++++++++ pkgs/servers/monitoring/grafana/plugins/plugins.nix | 1 + 2 files changed, 14 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix new file mode 100644 index 000000000000..cdf6b85c2a81 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "marcusolsson-calendar-panel"; + version = "3.7.0"; + zipHash = "sha256-O8EvkS+lWq2qaIj1HJzPagRGhrEENvY1YDBusvUejM0="; + meta = with lib; { + description = "Calendar Panel is a Grafana plugin that displays events from various data sources."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 0da18cf81461..d2cb4b3424df 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -21,6 +21,7 @@ grafana-polystat-panel = callPackage ./grafana-polystat-panel { }; grafana-worldmap-panel = callPackage ./grafana-worldmap-panel { }; marcusolsson-dynamictext-panel = callPackage ./marcusolsson-dynamictext-panel { }; + marcusolsson-calendar-panel = callPackage ./marcusolsson-calendar-panel { }; redis-app = callPackage ./redis-app { }; redis-datasource = callPackage ./redis-datasource { }; redis-explorer-app = callPackage ./redis-explorer-app { }; From 7928b64accd50519f77b4701fe8572cea41f08fb Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:51:21 +0300 Subject: [PATCH 15/22] grafanaPlugins.marcusolsson-csv-datasource: init at 0.6.19 --- .../marcusolsson-csv-datasource/default.nix | 18 ++++++++++++++++++ .../monitoring/grafana/plugins/plugins.nix | 1 + 2 files changed, 19 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix new file mode 100644 index 000000000000..bafa04400514 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-csv-datasource/default.nix @@ -0,0 +1,18 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "marcusolsson-csv-datasource"; + version = "0.6.19"; + zipHash = { + x86_64-linux = "sha256-HCwh8v9UeO7eeESZ78Hj6uvLext/x7bPfACe1u2BqTM="; + aarch64-linux = "sha256-2Qtwe34fe8KlIye3RuuNLjlWWgXGJvAmwWUnZD8LdWE="; + x86_64-darwin = "sha256-6sGA06INQbiRCd23ykdtUWAR+oA3YFh57KBT7zWUP44="; + aarch64-darwin = "sha256-gzQRcPeRqLvl27SB18hTTtcHx/namT2V0NOgX5J1mbs="; + }; + meta = with lib; { + description = "The Grafana CSV Datasource plugin is designed to load CSV data into Grafana, expanding your capabilities to visualize and analyze data stored in CSV (Comma-Separated Values) format."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index d2cb4b3424df..6718ea521ac2 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -22,6 +22,7 @@ grafana-worldmap-panel = callPackage ./grafana-worldmap-panel { }; marcusolsson-dynamictext-panel = callPackage ./marcusolsson-dynamictext-panel { }; marcusolsson-calendar-panel = callPackage ./marcusolsson-calendar-panel { }; + marcusolsson-csv-datasource = callPackage ./marcusolsson-csv-datasource { }; redis-app = callPackage ./redis-app { }; redis-datasource = callPackage ./redis-datasource { }; redis-explorer-app = callPackage ./redis-explorer-app { }; From 33a745c4f7df2c174eb4d365803fbfdec948f749 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:52:23 +0300 Subject: [PATCH 16/22] grafanaPlugins.marcusolsson-json-datasource: init at 1.3.17 --- .../marcusolsson-json-datasource/default.nix | 13 +++++++++++++ pkgs/servers/monitoring/grafana/plugins/plugins.nix | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix new file mode 100644 index 000000000000..f2ca72a12134 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-json-datasource/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "marcusolsson-json-datasource"; + version = "1.3.17"; + zipHash = "sha256-L1G5s9fEEuvNs5AWXlT00f+dU2/2Rtjm4R3kpFc4NRg="; + meta = with lib; { + description = "The Grafana JSON Datasource plugin empowers you to seamlessly integrate JSON data into Grafana."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 6718ea521ac2..cd33e70b6387 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -20,9 +20,10 @@ grafana-piechart-panel = callPackage ./grafana-piechart-panel { }; grafana-polystat-panel = callPackage ./grafana-polystat-panel { }; grafana-worldmap-panel = callPackage ./grafana-worldmap-panel { }; - marcusolsson-dynamictext-panel = callPackage ./marcusolsson-dynamictext-panel { }; marcusolsson-calendar-panel = callPackage ./marcusolsson-calendar-panel { }; marcusolsson-csv-datasource = callPackage ./marcusolsson-csv-datasource { }; + marcusolsson-dynamictext-panel = callPackage ./marcusolsson-dynamictext-panel { }; + marcusolsson-json-datasource = callPackage ./marcusolsson-json-datasource { }; redis-app = callPackage ./redis-app { }; redis-datasource = callPackage ./redis-datasource { }; redis-explorer-app = callPackage ./redis-explorer-app { }; From 71ebf0afd5e60bf1923cd2b0b48a70ccf2a95789 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:52:49 +0300 Subject: [PATCH 17/22] grafanaPlugins.ventura-psychrometric-panel: init at 4.5.1 --- .../monitoring/grafana/plugins/plugins.nix | 1 + .../ventura-psychrometric-panel/default.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index cd33e70b6387..65c037e0c8e5 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -27,4 +27,5 @@ redis-app = callPackage ./redis-app { }; redis-datasource = callPackage ./redis-datasource { }; redis-explorer-app = callPackage ./redis-explorer-app { }; + ventura-psychrometric-panel = callPackage ./ventura-psychrometric-panel { }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix new file mode 100644 index 000000000000..0b500e632039 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix @@ -0,0 +1,18 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "ventura-psychrometric-panel"; + version = "4.5.1"; + zipHash = "sha256-Y/Eh3eWZkPS8Q1eha7sEJ3wTMI7QxOr7MEbPc25fnGg="; + meta = with lib; { + description = "Grafana plugin to display air conditions on a psychrometric chart."; + license = licenses.bsd3 // { + spdxId = "BSD-3-Clause-LBNL"; + url = "https://spdx.org/licenses/BSD-3-Clause-LBNL.html"; + fullName = "Lawrence Berkeley National Labs BSD variant license"; + shortName = "lbnl-bsd3"; + }; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} From cabb94db0ec8408dd42c686bf98307ab62afc8d6 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:53:20 +0300 Subject: [PATCH 18/22] grafanaPlugins.volkovlabs-echarts-panel: init at 6.4.1 --- pkgs/servers/monitoring/grafana/plugins/plugins.nix | 1 + .../plugins/volkovlabs-echarts-panel/default.nix | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 65c037e0c8e5..6d8c2b2bc0d1 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -28,4 +28,5 @@ redis-datasource = callPackage ./redis-datasource { }; redis-explorer-app = callPackage ./redis-explorer-app { }; ventura-psychrometric-panel = callPackage ./ventura-psychrometric-panel { }; + volkovlabs-echarts-panel = callPackage ./volkovlabs-echarts-panel { }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix new file mode 100644 index 000000000000..ecb8b7f70727 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "volkovlabs-echarts-panel"; + version = "6.4.1"; + zipHash = "sha256-RHOfFKplZs0gbD/esvrpXkkPKPfo5R4zjCUJWPpkDNU="; + meta = with lib; { + description = "The Apache ECharts plugin is a visualization panel for Grafana that allows you to incorporate the popular Apache ECharts library into your Grafana dashboard."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} From e0a09aaac594d089054be2aa475736dbe554846a Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:53:43 +0300 Subject: [PATCH 19/22] grafanaPlugins.volkovlabs-form-panel: init at 4.6.0 --- pkgs/servers/monitoring/grafana/plugins/plugins.nix | 1 + .../plugins/volkovlabs-form-panel/default.nix | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 6d8c2b2bc0d1..97b29f6cb7dd 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -29,4 +29,5 @@ redis-explorer-app = callPackage ./redis-explorer-app { }; ventura-psychrometric-panel = callPackage ./ventura-psychrometric-panel { }; volkovlabs-echarts-panel = callPackage ./volkovlabs-echarts-panel { }; + volkovlabs-form-panel = callPackage ./volkovlabs-form-panel { }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix new file mode 100644 index 000000000000..21eb1fb5cf41 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "volkovlabs-form-panel"; + version = "4.6.0"; + zipHash = "sha256-ne2dfCr+PBodeaxGfZL0VrAxHLYEAaeQfuZQf2F3s0s="; + meta = with lib; { + description = "The Data Manipulation Panel is the first plugin that allows inserting and updating application data, as well as modifying configuration directly from your Grafana dashboard."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} From 42d65e72910c03df316356fd00cab512d846e17d Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:54:08 +0300 Subject: [PATCH 20/22] grafanaPlugins.volkovlabs-rss-datasource: init at 4.2.0 --- pkgs/servers/monitoring/grafana/plugins/plugins.nix | 1 + .../plugins/volkovlabs-rss-datasource/default.nix | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 97b29f6cb7dd..8609e55d8878 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -30,4 +30,5 @@ ventura-psychrometric-panel = callPackage ./ventura-psychrometric-panel { }; volkovlabs-echarts-panel = callPackage ./volkovlabs-echarts-panel { }; volkovlabs-form-panel = callPackage ./volkovlabs-form-panel { }; + volkovlabs-rss-datasource = callPackage ./volkovlabs-rss-datasource { }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix new file mode 100644 index 000000000000..06c5b41e798a --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-rss-datasource/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "volkovlabs-rss-datasource"; + version = "4.2.0"; + zipHash = "sha256-+3tgvpH6xlJORqN4Sx7qwzsiQZoLwdarzhx6kHvtOoY="; + meta = with lib; { + description = "The RSS/Atom data source is a plugin for Grafana that retrieves RSS/Atom feeds and allows visualizing them using Dynamic Text and other panels."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} From 60a29a6f9e792ea400d7a3fcf1a2f7d562930617 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:54:33 +0300 Subject: [PATCH 21/22] grafanaPlugins.volkovlabs-variable-panel: init at 3.5.0 --- pkgs/servers/monitoring/grafana/plugins/plugins.nix | 1 + .../plugins/volkovlabs-variable-panel/default.nix | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 8609e55d8878..13fa08fc61d0 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -31,4 +31,5 @@ volkovlabs-echarts-panel = callPackage ./volkovlabs-echarts-panel { }; volkovlabs-form-panel = callPackage ./volkovlabs-form-panel { }; volkovlabs-rss-datasource = callPackage ./volkovlabs-rss-datasource { }; + volkovlabs-variable-panel = callPackage ./volkovlabs-variable-panel { }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix new file mode 100644 index 000000000000..abeffe05dc10 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix @@ -0,0 +1,13 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "volkovlabs-variable-panel"; + version = "3.5.0"; + zipHash = "sha256-SqMTCdB+8OUo94zJ3eS5NoCeyjc7sdMCR0CTvVe/L1g="; + meta = with lib; { + description = "The Variable panel allows you to have dashboard filters in a separate panel which you can place anywhere on the dashboard."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +} From 77eb5806ca15fe39a424ddad54642c924aaa3d2d Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Fri, 4 Oct 2024 21:54:55 +0300 Subject: [PATCH 22/22] grafanaPlugins.yesoreyeram-infinity-datasource: init at 2.11.0 --- .../monitoring/grafana/plugins/plugins.nix | 1 + .../default.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix index 13fa08fc61d0..0a14dfab1559 100644 --- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix +++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix @@ -32,4 +32,5 @@ volkovlabs-form-panel = callPackage ./volkovlabs-form-panel { }; volkovlabs-rss-datasource = callPackage ./volkovlabs-rss-datasource { }; volkovlabs-variable-panel = callPackage ./volkovlabs-variable-panel { }; + yesoreyeram-infinity-datasource = callPackage ./yesoreyeram-infinity-datasource { }; } diff --git a/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix new file mode 100644 index 000000000000..7c6eab7d4931 --- /dev/null +++ b/pkgs/servers/monitoring/grafana/plugins/yesoreyeram-infinity-datasource/default.nix @@ -0,0 +1,18 @@ +{ grafanaPlugin, lib }: + +grafanaPlugin rec { + pname = "yesoreyeram-infinity-datasource"; + version = "2.11.0"; + zipHash = { + x86_64-linux = "sha256-p5qLRImAuV8pqbwn+egbGMiPW6xdy8yQoRWdoiE4+B8="; + aarch64-linux = "sha256-gmmFe2TrhPqTQz4aExx/kAgzqCcEvu2Az7SHmpJaMv8="; + x86_64-darwin = "sha256-BuOMpZK+NoJx32f3pqcDI5szIW4bQl3+yFZI9zjzYE8="; + aarch64-darwin = "sha256-ss/HxouKDZYZvF42KWJgMbOh9kSviH5oz6f/mrlcXk8="; + }; + meta = with lib; { + description = "Visualize data from JSON, CSV, XML, GraphQL and HTML endpoints in Grafana."; + license = licenses.asl20; + maintainers = with maintainers; [ nagisa ]; + platforms = platforms.unix; + }; +}