fix(buildbot): bring back the old Gerrit reporting

Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
fix(buildbot): use builder-9 as builder-10 is down
2024-10-18 13:47:33 +02:00 · 2024-10-18 13:47:26 +02:00 · 2024-10-18 13:47:18 +02:00 · 2024-10-13 17:24:51 +02:00
13 changed files with 398 additions and 560 deletions
--- a/common/admins.nix
+++ b/common/admins.nix
@ -2,7 +2,7 @@
 let
  inherit (lib) genAttrs;
 in
-# Note: to add somefew in this list.
+# Note: to add somefew in this list. 
 # Ensure their SSH key is already in common/ssh-keys.nix with
 # the same username for here, so that the keys is automatically added.
 {
@ -19,14 +19,12 @@ in
      "thubrecht"
      "winter"
      "yuka"
-      "ckie"
    ];

    lix-infra.members = [
      "raito"
      "hexchen"
      "jade"
-      "pennae"
    ];
  };
  bagel.users = genAttrs [
@ -41,7 +39,5 @@ in
    "thubrecht"
    "winter"
    "yuka"
-    "ckie"
-    "pennae"
  ] (name: {});
 }
--- a/common/ssh-keys.nix
+++ b/common/ssh-keys.nix
@ -63,10 +63,5 @@
    thubrecht = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPM1jpXR7BWQa7Sed7ii3SbvIPRRlKb3G91qC0vOwfJn" ];
    yuka = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIxQ3NYBi8v1f/vhxLKDcA6upmX0pctRDbnK6SER5OUR yureka" ];
    winter = [ "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIH/LDRUG+U+++UmlxvA2kspioTjktQZ8taDcHq8gVlkfAAAABHNzaDo=" ];
-    ckie = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH3uTwzSSMAPg84fwbNp2cq9+BdLFeA1VzDGth4zCAbz https://mei.puppycat.house" ];
-    pennae = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC5Wf5/IbyFpdziWfwxkQqxOf3r1L9pYn6xQBEKFwmMY"
-      "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIK8icXjHkb4XzbIVN3djH4CE7RvgGd+3xbG4cgh0Yls5AAAABHNzaDo="
-    ];
  };
 }
--- a/hosts/gerrit01/default.nix
+++ b/hosts/gerrit01/default.nix
@ -23,9 +23,6 @@
    };
  };

-  # Block all these crawlers!!
-  bagel.services.nginx.crawler-blocker.enable = true;
-
  fileSystems."/gerrit-data" = {
    device = "/dev/disk/by-uuid/d1062305-0dea-4740-9a27-b6b1691862a4";
    fsType = "ext4";
--- a/services/block-crawlers/blocked-ua.txt
+++ b/services/block-crawlers/blocked-ua.txt
@ -1,40 +0,0 @@
-AI2Bot
-Ai2Bot-Dolma
-Amazonbot
-anthropic-ai
-Applebot
-Applebot-Extended
-Bytespider
-CCBot
-ChatGPT-User
-Claude-Web
-ClaudeBot
-cohere-ai
-Diffbot
-FacebookBot
-facebookexternalhit
-FriendlyCrawler
-Google-Extended
-GoogleOther
-GoogleOther-Image
-GoogleOther-Video
-GPTBot
-iaskspider/2.0
-ICC-Crawler
-ImagesiftBot
-img2dataset
-ISSCyberRiskCrawler
-Kangaroo Bot
-Meta-ExternalAgent
-Meta-ExternalFetcher
-OAI-SearchBot
-omgili
-omgilibot
-PerplexityBot
-PetalBot
-Scrapy
-Sidetrade indexer bot
-Timpibot
-VelenPublicWebCrawler
-Webzio-Extended
-YouBot
--- a/services/block-crawlers/default.nix
+++ b/services/block-crawlers/default.nix
@ -1,32 +0,0 @@
-{ pkgs, config, lib, ... }:
-let
-  inherit (lib) mkEnableOption mkIf mkOption types concatStringsSep mkDefault splitString;
-  cfg = config.bagel.services.nginx.crawler-blocker;
-  mkRobotsFile = blockedUAs: pkgs.writeText "robots.txt" ''
-    ${concatStringsSep "\n" (map (ua: "User-agent: ${ua}") blockedUAs)}
-    Disallow: /
-  '';
-in
-{
-  options = {
-    bagel.services.nginx.crawler-blocker = {
-      enable = mkEnableOption "the crawler blocker";
-
-      userAgents = mkOption {
-        type = types.listOf types.str;
-        default = splitString "\n" (builtins.readFile ./blocked-ua.txt);
-      };
-    };
-
-    services.nginx.virtualHosts = mkOption {
-      type = types.attrsOf (types.submodule {
-        config = {
-          locations."= /robots.txt" = mkIf cfg.enable (mkDefault {
-            alias = mkRobotsFile cfg.userAgents;
-          });
-        };
-      });
-    };
-  };
-}
-
--- a/services/buildbot/default.nix
+++ b/services/buildbot/default.nix
@ -194,32 +194,6 @@ in
      RestartSteps = 10;
    };

-    services.postgresql.settings = {
-      # DB Version: 15
-      # OS Type: linux
-      # DB Type: web
-      # Total Memory (RAM): 64 GB
-      # CPUs num: 16
-      # Connections num: 100
-      # Data Storage: ssd
-      max_connections = 100;
-      shared_buffers = "16GB";
-      effective_cache_size = "48GB";
-      maintenance_work_mem = "2GB";
-      checkpoint_completion_target = 0.9;
-      wal_buffers = "16MB";
-      default_statistics_target = 100;
-      random_page_cost = 1.1;
-      effective_io_concurrency = 200;
-      work_mem = "41943kB";
-      huge_pages = "try";
-      min_wal_size = "1GB";
-      max_wal_size = "4GB";
-      max_worker_processes = 16;
-      max_parallel_workers_per_gather = 4;
-      max_parallel_workers = 16;
-      max_parallel_maintenance_workers = 4;
-    };

    nix.settings.keep-derivations = true;
    nix.gc = {
--- a/services/default.nix
+++ b/services/default.nix
@ -1,6 +1,5 @@
 {
  imports = [
-    ./block-crawlers
    ./gerrit
    ./channel-scripts
    ./hydra
--- a/services/gerrit/default.nix
+++ b/services/gerrit/default.nix
@ -129,9 +129,7 @@ in
      serverId = "9e5216ad-038d-4d74-a4e8-716515834a94";

      builtinPlugins = [
-        # Disable gitiles as it generates too much traffic.
-        # Prefer git.forkos.org.
-        # "gitiles"
+        "gitiles"
        "codemirror-editor"
        "reviewnotes"
        "download-commands"
--- a/services/gerrit/www.nix
+++ b/services/gerrit/www.nix
@ -29,6 +29,10 @@ in
            # NGINX should not give up super fast. Things can take time.
            proxy_read_timeout 3600;
          }
+
+          location = /robots.txt {
+            return 200 'User-agent: *\nAllow: /';
+          }
        '';
      };

--- a/services/matrix/default.nix
+++ b/services/matrix/default.nix
@ -32,11 +32,6 @@ in
          ];
          server_name = "forkos.org";
          database.backend = "rocksdb";
-
-          server_discovery = {
-            server.authority = "matrix.forkos.org:443";
-            client.base_url = "https://matrix.forkos.org";
-          };
        };
      };

@ -53,7 +48,18 @@ in
          "forkos.org" = {
            forceSSL = true;
            enableACME = true;
-            locations."/.well-known/matrix".proxyPass = "http://grapevine";
+            locations = {
+              "= /.well-known/matrix/server".extraConfig = ''
+                add_header Content-Type application/json;
+                add_header Access-Control-Allow-Origin *;
+                return 200 '{"m.server": "matrix.forkos.org:443"}';
+              '';
+              "= /.well-known/matrix/client".extraConfig = ''
+                add_header Content-Type application/json;
+                add_header Access-Control-Allow-Origin *;
+                return 200 '{"m.homeserver": {"base_url": "https://matrix.forkos.org/"}, "m.identity_server": {"base_url": "https://matrix.org/"}, "org.matrix.msc3575.proxy": {"url": "https://matrix.forkos.org"}}';
+              '';
+            };
          };
        };
      };
--- a/services/monitoring/exporters/postgres.nix
+++ b/services/monitoring/exporters/postgres.nix
@ -23,10 +23,7 @@ in
    };

    services.postgresql.settings.shared_preload_libraries = "pg_stat_statements";
-    systemd.services.postgresql.postStart = lib.mkAfter ''
-      ${config.services.postgresql.package}/bin/psql -U postgres -c "CREATE EXTENSION IF NOT EXISTS pg_stat_statements;";
-    '';

    bagel.monitoring.grafana-agent.exporters.postgres.port = 9104;
  };
-}
+}
--- a/services/monitoring/lgtm/dashboards/node_exporter.json
+++ b/services/monitoring/lgtm/dashboards/node_exporter.json
--- a/services/monitoring/lgtm/dashboards/postgres2.json
+++ b/services/monitoring/lgtm/dashboards/postgres2.json
@ -20,6 +20,7 @@
  "fiscalYearStartMonth": 0,
  "gnetId": 9628,
  "graphTooltip": 0,
+  "id": 27,
  "links": [],
  "liveNow": false,
  "panels": [
@ -100,7 +101,6 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "horizontal",
-        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "mean"
@ -112,14 +112,14 @@
        "textMode": "name",
        "wideLayout": true
      },
-      "pluginVersion": "11.2.1",
+      "pluginVersion": "11.0.0",
      "targets": [
        {
          "datasource": {
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_static{tenant=\"$tenant\",hostname=\"$hostname\"}",
+          "expr": "pg_static{hostname=\"$hostname\"}",
          "format": "time_series",
          "instant": true,
          "intervalFactor": 1,
@ -182,7 +182,6 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "horizontal",
-        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "mean"
@ -194,14 +193,14 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "11.2.1",
+      "pluginVersion": "11.0.0",
      "targets": [
        {
          "datasource": {
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_postmaster_start_time_seconds{tenant=\"$tenant\",hostname=\"$hostname\"} * 1000",
+          "expr": "pg_postmaster_start_time_seconds{hostname=\"$hostname\"} * 1000",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "",
@ -262,7 +261,6 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "horizontal",
-        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "lastNotNull"
@ -274,14 +272,14 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "11.2.1",
+      "pluginVersion": "11.0.0",
      "targets": [
        {
          "datasource": {
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "SUM(pg_stat_database_tup_fetched{datname=~\"$datname\", tenant=\"$tenant\",hostname=~\"$hostname\"})",
+          "expr": "SUM(pg_stat_database_tup_fetched{datname=~\"$datname\", hostname=~\"$hostname\"})",
          "format": "time_series",
          "intervalFactor": 2,
          "refId": "A",
@ -342,7 +340,6 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "horizontal",
-        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "lastNotNull"
@ -354,14 +351,14 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "11.2.1",
+      "pluginVersion": "11.0.0",
      "targets": [
        {
          "datasource": {
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "SUM(pg_stat_database_tup_inserted{datname=~\"$datname\", tenant=\"$tenant\",hostname=~\"$hostname\"})",
+          "expr": "SUM(pg_stat_database_tup_inserted{datname=~\"$datname\", hostname=~\"$hostname\"})",
          "format": "time_series",
          "intervalFactor": 2,
          "refId": "A",
@ -422,7 +419,6 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "horizontal",
-        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "lastNotNull"
@ -434,14 +430,14 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "11.2.1",
+      "pluginVersion": "11.0.0",
      "targets": [
        {
          "datasource": {
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "SUM(pg_stat_database_tup_updated{datname=~\"$datname\", tenant=\"$tenant\",hostname=~\"$hostname\"})",
+          "expr": "SUM(pg_stat_database_tup_updated{datname=~\"$datname\", hostname=~\"$hostname\"})",
          "format": "time_series",
          "intervalFactor": 2,
          "refId": "A",
@ -502,7 +498,6 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "horizontal",
-        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "mean"
@ -514,14 +509,14 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "11.2.1",
+      "pluginVersion": "11.0.0",
      "targets": [
        {
          "datasource": {
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_settings_max_connections{tenant=\"$tenant\",hostname=\"$hostname\"}",
+          "expr": "pg_settings_max_connections{hostname=\"$hostname\"}",
          "format": "time_series",
          "intervalFactor": 1,
          "refId": "A"
@ -607,7 +602,6 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "horizontal",
-        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "lastNotNull"
@ -619,14 +613,14 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "11.2.1",
+      "pluginVersion": "11.0.0",
      "targets": [
        {
          "datasource": {
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_settings_shared_buffers_bytes{tenant=\"$tenant\",hostname=\"$hostname\"}",
+          "expr": "pg_settings_shared_buffers_bytes{hostname=\"$hostname\"}",
          "format": "time_series",
          "intervalFactor": 1,
          "refId": "A"
@ -686,7 +680,6 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "horizontal",
-        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "lastNotNull"
@ -698,14 +691,14 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "11.2.1",
+      "pluginVersion": "11.0.0",
      "targets": [
        {
          "datasource": {
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_settings_effective_cache_size_bytes{tenant=\"$tenant\",hostname=\"$hostname\"}",
+          "expr": "pg_settings_effective_cache_size_bytes{hostname=\"$hostname\"}",
          "format": "time_series",
          "intervalFactor": 1,
          "refId": "A"
@ -765,7 +758,6 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "horizontal",
-        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "lastNotNull"
@ -777,14 +769,14 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "11.2.1",
+      "pluginVersion": "11.0.0",
      "targets": [
        {
          "datasource": {
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_settings_maintenance_work_mem_bytes{tenant=\"$tenant\",hostname=\"$hostname\"}",
+          "expr": "pg_settings_maintenance_work_mem_bytes{hostname=\"$hostname\"}",
          "format": "time_series",
          "intervalFactor": 1,
          "refId": "A"
@ -844,7 +836,6 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "horizontal",
-        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "lastNotNull"
@ -856,14 +847,14 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "11.2.1",
+      "pluginVersion": "11.0.0",
      "targets": [
        {
          "datasource": {
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_settings_work_mem_bytes{tenant=\"$tenant\",hostname=\"$hostname\"}",
+          "expr": "pg_settings_work_mem_bytes{hostname=\"$hostname\"}",
          "format": "time_series",
          "intervalFactor": 1,
          "legendFormat": "",
@ -925,7 +916,6 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "horizontal",
-        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "lastNotNull"
@ -937,14 +927,14 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "11.2.1",
+      "pluginVersion": "11.0.0",
      "targets": [
        {
          "datasource": {
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_settings_max_wal_size_bytes{tenant=\"$tenant\",hostname=\"$hostname\"}",
+          "expr": "pg_settings_max_wal_size_bytes{hostname=\"$hostname\"}",
          "format": "time_series",
          "intervalFactor": 1,
          "refId": "A"
@ -1004,7 +994,6 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "horizontal",
-        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "lastNotNull"
@ -1016,14 +1005,14 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "11.2.1",
+      "pluginVersion": "11.0.0",
      "targets": [
        {
          "datasource": {
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_settings_random_page_cost{tenant=\"$tenant\",hostname=\"$hostname\"}",
+          "expr": "pg_settings_random_page_cost{hostname=\"$hostname\"}",
          "format": "time_series",
          "intervalFactor": 1,
          "refId": "A"
@ -1083,7 +1072,6 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "horizontal",
-        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "lastNotNull"
@ -1095,7 +1083,7 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "11.2.1",
+      "pluginVersion": "11.0.0",
      "targets": [
        {
          "datasource": {
@ -1162,7 +1150,6 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "horizontal",
-        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "mean"
@ -1174,14 +1161,14 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "11.2.1",
+      "pluginVersion": "11.0.0",
      "targets": [
        {
          "datasource": {
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_settings_max_worker_processes{tenant=\"$tenant\",hostname=\"$hostname\"}",
+          "expr": "pg_settings_max_worker_processes{hostname=\"$hostname\"}",
          "format": "time_series",
          "intervalFactor": 1,
          "refId": "A"
@ -1241,7 +1228,6 @@
        "graphMode": "none",
        "justifyMode": "auto",
        "orientation": "horizontal",
-        "percentChangeColorMode": "standard",
        "reduceOptions": {
          "calcs": [
            "lastNotNull"
@ -1253,14 +1239,14 @@
        "textMode": "auto",
        "wideLayout": true
      },
-      "pluginVersion": "11.2.1",
+      "pluginVersion": "11.0.0",
      "targets": [
        {
          "datasource": {
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_settings_max_parallel_workers{tenant=\"$tenant\",hostname=\"$hostname\"}",
+          "expr": "pg_settings_max_parallel_workers{hostname=\"$hostname\"}",
          "format": "time_series",
          "intervalFactor": 1,
          "refId": "A"
@ -1312,7 +1298,6 @@
            "axisLabel": "",
            "axisPlacement": "auto",
            "barAlignment": 0,
-            "barWidthFactor": 0.6,
            "drawStyle": "points",
            "fillOpacity": 10,
            "gradientMode": "none",
@ -1387,7 +1372,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_stat_activity_count{datname=~\"$datname\", tenant=\"$tenant\",hostname=~\"$hostname\", state=\"active\"} !=0",
+          "expr": "pg_stat_activity_count{datname=~\"$datname\", hostname=~\"$hostname\", state=\"active\"} !=0",
          "format": "time_series",
          "interval": "",
          "intervalFactor": 2,
@ -1416,7 +1401,6 @@
            "axisLabel": "",
            "axisPlacement": "auto",
            "barAlignment": 0,
-            "barWidthFactor": 0.6,
            "drawStyle": "line",
            "fillOpacity": 10,
            "gradientMode": "none",
@ -1490,7 +1474,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "irate(pg_stat_database_xact_commit{tenant=\"$tenant\",hostname=\"$hostname\", datname=~\"$datname\"}[5m])",
+          "expr": "irate(pg_stat_database_xact_commit{hostname=\"$hostname\", datname=~\"$datname\"}[5m])",
          "format": "time_series",
          "intervalFactor": 1,
          "legendFormat": "{{datname}} commits",
@ -1501,7 +1485,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "irate(pg_stat_database_xact_rollback{tenant=\"$tenant\",hostname=\"$hostname\", datname=~\"$datname\"}[5m])",
+          "expr": "irate(pg_stat_database_xact_rollback{hostname=\"$hostname\", datname=~\"$datname\"}[5m])",
          "format": "time_series",
          "intervalFactor": 1,
          "legendFormat": "{{datname}} rollbacks",
@ -1528,7 +1512,6 @@
            "axisLabel": "",
            "axisPlacement": "auto",
            "barAlignment": 0,
-            "barWidthFactor": 0.6,
            "drawStyle": "line",
            "fillOpacity": 10,
            "gradientMode": "none",
@ -1602,7 +1585,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_stat_database_tup_updated{datname=~\"$datname\", tenant=\"$tenant\",hostname=~\"$hostname\"} != 0",
+          "expr": "pg_stat_database_tup_updated{datname=~\"$datname\", hostname=~\"$hostname\"} != 0",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{datname}}",
@ -1630,7 +1613,6 @@
            "axisLabel": "",
            "axisPlacement": "auto",
            "barAlignment": 0,
-            "barWidthFactor": 0.6,
            "drawStyle": "line",
            "fillOpacity": 10,
            "gradientMode": "none",
@ -1704,7 +1686,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_stat_database_tup_fetched{datname=~\"$datname\", tenant=\"$tenant\",hostname=~\"$hostname\"} != 0",
+          "expr": "pg_stat_database_tup_fetched{datname=~\"$datname\", hostname=~\"$hostname\"} != 0",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{datname}}",
@ -1732,7 +1714,6 @@
            "axisLabel": "",
            "axisPlacement": "auto",
            "barAlignment": 0,
-            "barWidthFactor": 0.6,
            "drawStyle": "line",
            "fillOpacity": 10,
            "gradientMode": "none",
@ -1806,7 +1787,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_stat_database_tup_inserted{datname=~\"$datname\", tenant=\"$tenant\",hostname=~\"$hostname\"} != 0",
+          "expr": "pg_stat_database_tup_inserted{datname=~\"$datname\", hostname=~\"$hostname\"} != 0",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{datname}}",
@ -1834,7 +1815,6 @@
            "axisLabel": "",
            "axisPlacement": "auto",
            "barAlignment": 0,
-            "barWidthFactor": 0.6,
            "drawStyle": "line",
            "fillOpacity": 10,
            "gradientMode": "none",
@ -1910,7 +1890,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_locks_count{datname=~\"$datname\", tenant=\"$tenant\",hostname=~\"$hostname\", mode=~\"$mode\"} != 0",
+          "expr": "pg_locks_count{datname=~\"$datname\", hostname=~\"$hostname\", mode=~\"$mode\"} != 0",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{datname}},{{mode}}",
@ -1968,7 +1948,8 @@
            "mode": "absolute",
            "steps": [
              {
-                "color": "green"
+                "color": "green",
+                "value": null
              },
              {
                "color": "red",
@ -2010,7 +1991,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_stat_database_tup_returned{datname=~\"$datname\", tenant=\"$tenant\",hostname=~\"$hostname\"} != 0",
+          "expr": "pg_stat_database_tup_returned{datname=~\"$datname\", hostname=~\"$hostname\"} != 0",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{datname}}",
@ -2069,7 +2050,8 @@
            "mode": "absolute",
            "steps": [
              {
-                "color": "green"
+                "color": "green",
+                "value": null
              },
              {
                "color": "red",
@ -2110,7 +2092,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_stat_activity_count{datname=~\"$datname\", tenant=\"$tenant\",hostname=~\"$hostname\", state=~\"idle|idle in transaction|idle in transaction (aborted)\"}",
+          "expr": "pg_stat_activity_count{datname=~\"$datname\", hostname=~\"$hostname\", state=~\"idle|idle in transaction|idle in transaction (aborted)\"}",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{datname}}, s: {{state}}",
@ -2168,7 +2150,8 @@
            "mode": "absolute",
            "steps": [
              {
-                "color": "green"
+                "color": "green",
+                "value": null
              },
              {
                "color": "red",
@ -2210,7 +2193,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_stat_database_tup_deleted{datname=~\"$datname\", tenant=\"$tenant\",hostname=~\"$hostname\"} != 0",
+          "expr": "pg_stat_database_tup_deleted{datname=~\"$datname\", hostname=~\"$hostname\"} != 0",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{datname}}",
@ -2269,7 +2252,8 @@
            "mode": "absolute",
            "steps": [
              {
-                "color": "green"
+                "color": "green",
+                "value": null
              },
              {
                "color": "red",
@ -2310,7 +2294,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "pg_stat_database_blks_hit{tenant=\"$tenant\",hostname=\"$hostname\", datname=~\"$datname\"} / (pg_stat_database_blks_read{tenant=\"$tenant\",hostname=\"$hostname\", datname=~\"$datname\"} + pg_stat_database_blks_hit{tenant=\"$tenant\",hostname=\"$hostname\", datname=~\"$datname\"})",
+          "expr": "pg_stat_database_blks_hit{hostname=\"$hostname\", datname=~\"$datname\"} / (pg_stat_database_blks_read{hostname=\"$hostname\", datname=~\"$datname\"} + pg_stat_database_blks_hit{hostname=\"$hostname\", datname=~\"$datname\"})",
          "format": "time_series",
          "intervalFactor": 1,
          "legendFormat": "{{ datname }}",
@ -2367,7 +2351,8 @@
            "mode": "absolute",
            "steps": [
              {
-                "color": "green"
+                "color": "green",
+                "value": null
              },
              {
                "color": "red",
@ -2410,7 +2395,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "irate(pg_stat_bgwriter_buffers_backend{tenant=\"$tenant\",hostname=\"$hostname\"}[5m])",
+          "expr": "irate(pg_stat_bgwriter_buffers_backend{hostname=\"$hostname\"}[5m])",
          "format": "time_series",
          "intervalFactor": 1,
          "legendFormat": "buffers_backend",
@ -2421,7 +2406,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "irate(pg_stat_bgwriter_buffers_alloc{tenant=\"$tenant\",hostname=\"$hostname\"}[5m])",
+          "expr": "irate(pg_stat_bgwriter_buffers_alloc{hostname=\"$hostname\"}[5m])",
          "format": "time_series",
          "intervalFactor": 1,
          "legendFormat": "buffers_alloc",
@ -2432,7 +2417,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "irate(pg_stat_bgwriter_buffers_backend_fsync{tenant=\"$tenant\",hostname=\"$hostname\"}[5m])",
+          "expr": "irate(pg_stat_bgwriter_buffers_backend_fsync{hostname=\"$hostname\"}[5m])",
          "format": "time_series",
          "intervalFactor": 1,
          "legendFormat": "backend_fsync",
@ -2443,7 +2428,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "irate(pg_stat_bgwriter_buffers_checkpoint{tenant=\"$tenant\",hostname=\"$hostname\"}[5m])",
+          "expr": "irate(pg_stat_bgwriter_buffers_checkpoint{hostname=\"$hostname\"}[5m])",
          "format": "time_series",
          "intervalFactor": 1,
          "legendFormat": "buffers_checkpoint",
@ -2454,7 +2439,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "irate(pg_stat_bgwriter_buffers_clean{tenant=\"$tenant\",hostname=\"$hostname\"}[5m])",
+          "expr": "irate(pg_stat_bgwriter_buffers_clean{hostname=\"$hostname\"}[5m])",
          "format": "time_series",
          "intervalFactor": 1,
          "legendFormat": "buffers_clean",
@ -2512,7 +2497,8 @@
            "mode": "absolute",
            "steps": [
              {
-                "color": "green"
+                "color": "green",
+                "value": null
              },
              {
                "color": "red",
@ -2554,7 +2540,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "irate(pg_stat_database_conflicts{tenant=\"$tenant\",hostname=\"$hostname\", datname=~\"$datname\"}[5m])",
+          "expr": "irate(pg_stat_database_conflicts{hostname=\"$hostname\", datname=~\"$datname\"}[5m])",
          "format": "time_series",
          "intervalFactor": 1,
          "legendFormat": "{{datname}} conflicts",
@ -2565,7 +2551,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "irate(pg_stat_database_deadlocks{tenant=\"$tenant\",hostname=\"$hostname\", datname=~\"$datname\"}[5m])",
+          "expr": "irate(pg_stat_database_deadlocks{hostname=\"$hostname\", datname=~\"$datname\"}[5m])",
          "format": "time_series",
          "intervalFactor": 1,
          "legendFormat": "{{datname}} deadlocks",
@ -2624,7 +2610,8 @@
            "mode": "absolute",
            "steps": [
              {
-                "color": "green"
+                "color": "green",
+                "value": null
              },
              {
                "color": "red",
@ -2666,7 +2653,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "irate(pg_stat_database_temp_bytes{tenant=\"$tenant\",hostname=\"$hostname\", datname=~\"$datname\"}[5m])",
+          "expr": "irate(pg_stat_database_temp_bytes{hostname=\"$hostname\", datname=~\"$datname\"}[5m])",
          "format": "time_series",
          "intervalFactor": 1,
          "legendFormat": "{{datname}}",
@ -2723,7 +2710,8 @@
            "mode": "absolute",
            "steps": [
              {
-                "color": "green"
+                "color": "green",
+                "value": null
              },
              {
                "color": "red",
@ -2766,7 +2754,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "irate(pg_stat_bgwriter_checkpoint_write_time{tenant=\"$tenant\",hostname=\"$hostname\"}[5m])",
+          "expr": "irate(pg_stat_bgwriter_checkpoint_write_time{hostname=\"$hostname\"}[5m])",
          "format": "time_series",
          "intervalFactor": 1,
          "legendFormat": "write_time - Total amount of time that has been spent in the portion of checkpoint processing where files are written to disk.",
@ -2777,7 +2765,7 @@
            "type": "prometheus",
            "uid": "mimir"
          },
-          "expr": "irate(pg_stat_bgwriter_checkpoint_sync_time{tenant=\"$tenant\",hostname=\"$hostname\"}[5m])",
+          "expr": "irate(pg_stat_bgwriter_checkpoint_sync_time{hostname=\"$hostname\"}[5m])",
          "format": "time_series",
          "intervalFactor": 1,
          "legendFormat": "sync_time - Total amount of time that has been spent in the portion of checkpoint processing where files are synchronized to disk.",
@ -2878,32 +2866,8 @@
      {
        "current": {
          "selected": false,
-          "text": "fake",
-          "value": "fake"
-        },
-        "definition": "label_values(tenant)",
-        "hide": 0,
-        "includeAll": true,
-        "label": "Tenant",
-        "multi": true,
-        "name": "tenant",
-        "options": [],
-        "query": {
-          "qryType": 1,
-          "query": "label_values(tenant)",
-          "refId": "PrometheusVariableQueryEditor-VariableQuery"
-        },
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
-      },
-      {
-        "current": {
-          "selected": true,
-          "text": "buildbot",
-          "value": "buildbot"
+          "text": "bagel-box",
+          "value": "bagel-box"
        },
        "datasource": {
          "type": "prometheus",
@ -2998,6 +2962,7 @@
    "from": "now-6h",
    "to": "now"
  },
+  "timeRangeUpdatedDuringEditOrView": false,
  "timepicker": {
    "refresh_intervals": [
      "5s",
@ -3028,4 +2993,4 @@
  "uid": "000000039",
  "version": 1,
  "weekStart": ""
-}
+}
Author	SHA1	Message	Date
raito	bc12565a74	fix(buildbot): bring back the old Gerrit reporting Signed-off-by: Raito Bezarius <masterancpp@gmail.com>	2024-10-18 13:47:33 +02:00
raito	aab4442770	fix(buildbot): use builder-9 as builder-10 is down Signed-off-by: Raito Bezarius <masterancpp@gmail.com>	2024-10-18 13:47:26 +02:00
raito	0341bf431a	fix(buildbot): fix CORS properly wildcards are not allowed in the headers. We need to include credentials as well. Signed-off-by: Raito Bezarius <masterancpp@gmail.com>	2024-10-18 13:47:18 +02:00
raito	3f80464553	fix(buildbot): remove CORS wildcards for their precise Gerrit hosts wildcards are not supported in CORS headers, so this design was quite wrong actually. We can just use the actual Gerrit hostname for now. Signed-off-by: Raito Bezarius <masterancpp@gmail.com>	2024-10-13 17:24:51 +02:00