update monitoring

2020-05-31 20:14:41 +02:00 · 2020-05-31 20:14:41 +02:00 · d11a9d3aaf
parent bbfac688c8
commit d11a9d3aaf
5 changed files with 43 additions and 23 deletions
--- a/monitoring/jsonnetfile.lock.json
+++ b/monitoring/jsonnetfile.lock.json
@ -18,7 +18,7 @@
          "subdir": "Documentation/etcd-mixin"
        }
      },
-      "version": "747ff75c96df87530bcd8b6b02d1160c5500bf4e",
+      "version": "09fcf55ca498ade69f4ceb5b3c6afc2930f3621f",
      "sum": "pk7mLpdUrHuJKkj2vhD6LGMU7P+oYYooBXAeZyZa398="
    },
    {
@ -28,7 +28,7 @@
          "subdir": "jsonnet/kube-prometheus"
        }
      },
-      "version": "5a84ac52c7517a420b3bdf3cd251e8abce59a300",
+      "version": "7e0c503b137c25b9e1e68d143f6a298fe125d1b7",
      "sum": "cEMmJvhn8dLnLqUVR0ql/XnwY8Jy3HH0YWIQQRaDD0o="
    },
    {
@ -48,8 +48,8 @@
          "subdir": "grafonnet"
        }
      },
-      "version": "5736b62831d779e28a8344646aee1f72b1fa1d90",
-      "sum": "ch97Uqauz7z+9mkOwzRz6JErxgWcQlfuJEEg+XHEadg="
+      "version": "7ab8a79738de007c407b939b35e54e84c213d542",
+      "sum": "q2B0w9iyqTD99PJacSpHg9XshQN7kiupxaORQcAlb2E="
    },
    {
      "source": {
@ -58,7 +58,7 @@
          "subdir": "grafana-builder"
        }
      },
-      "version": "811ccb022bc2bdcd0b8281ed0a0c858c63e20542",
+      "version": "b9cc0f3529833096c043084c04bc7b3562a134c4",
      "sum": "slxrtftVDiTlQK22ertdfrg4Epnq97gdrLI63ftUfaE="
    },
    {
@ -79,8 +79,8 @@
          "subdir": ""
        }
      },
-      "version": "2beabb38d3241eb5da5080cbeb648a0cd1e3cbc2",
-      "sum": "s6t8ntlUHAjnifWx5V1jnBukTLPya7fX7YZVxJ0GcTk="
+      "version": "4626a8d0dd261dbefa91d9d60cf8bc8240bd053f",
+      "sum": "70WRBU/sDZ7i7CPufohrmssWb4nJQcUJDD+83HxbUto="
    },
    {
      "source": {
@ -89,7 +89,7 @@
          "subdir": "lib/promgrafonnet"
        }
      },
-      "version": "2beabb38d3241eb5da5080cbeb648a0cd1e3cbc2",
+      "version": "4626a8d0dd261dbefa91d9d60cf8bc8240bd053f",
      "sum": "VhgBM39yv0f4bKv8VfGg4FXkg573evGDRalip9ypKbc="
    },
    {
@ -119,7 +119,7 @@
          "subdir": "docs/node-mixin"
        }
      },
-      "version": "2aef188bc819bade18ec297f9ce34f200caf1431",
+      "version": "e92c7b5bbf8b2224bbf5c4eb4839eff3c0bcfb83",
      "sum": "3jFV2qsc/GZe2GADswTYqxxP2zGOiANTj73W/VNFGqc="
    },
    {
@ -129,7 +129,7 @@
          "subdir": "documentation/prometheus-mixin"
        }
      },
-      "version": "4658ce60d1f21529a7ffe35ab0a30baeefbe1a04",
+      "version": "58c445e6efdf24ceec0e77da9042c85cb500aa87",
      "sum": "kRb3XBTe/AALDcaTFfyuiKqzhxtLvihBkVkvJ5cUd/I=",
      "name": "prometheus"
    },
--- a/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml
+++ b/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml
@ -6,7 +6,7 @@ metadata:
  namespace: monitoring
 spec:
  encryptedData:
-    alertmanager.yaml: AgB0ICNToZbGgaMyc61u4Swfz6FQpCRV75/wp0IfECYNOc7KcM5Ldu5wRZZ7HbFhYfNFQSwzmOmuQSEnc92yRpIbr5oAtVqEzKjB/MqiYjNowXC3OPJ4Oiv2IC28Ol5YCYqu38CrzNqsQwG8o3/GHxCKmDfHT28LGd07cPBPYAhepoP8ocvLtwV4cHcEPyex3jHo1ocCunU3dMBM1bupc7qYpcWhwlEM5ZO3Kunbqqsfp7em28kS4m3BAgDkoBOzIbu+aGacSZTnox6cAoA+Xj/couKorURE9Wfu7sgZnB5rkNy6SQNsFhOo9HQsLhApc6H2VyIPhfCIMPs00go+53jzT4ny9uR5ZrDKq93cO8KJQVC5srtoM+ynhnm+OlT9vJG9UG1c6tUEvAVzXcoX9EBnVnMVesKYUs1fGoiJW8/x6OYdPgIyHcaIh4A+AClD63SEOi4nyJ4brOVppy14QpdZcNQCYtvGFoP4gJ/PFf27Kj944jvXz1mDP0xi1t/x1DzKrtJoVyHscXn7QeVyJYMeC9Fogt50KUWds5BVz4coZqfgjZZphE6MCEGQT9RA8AeGAI/ue3BgBOe06mC1f6KRbYn1iKBu2iB4uez8FUjORw6DgZpmLGf3TOQoEY8MD4MqdinEG2svZMxQv9Ubo3kzv3TBB+QxKo22EFeATA/BPfQxpliIGQFhCuO8whIcHLC57q7ea5+rFmcBa136Fm85gP+cbqnG1KN0hxe+Bhr+kq+rLItYFET5CUDmocPjAjfqQIuN7sYPZ7f7afyk90Nkp7JedMHAH7cZNEXqri0Ng8KXM8reffKrrQKI03Mco0/w5pwALNe1B5wXz1tvNRYegw6/U8L9p7GEmQQkMYzlHqjiRiPZkPIxGcfMPEVGCuYmyMJT+hB8MIylWIVKP8vMwvyrTWKyQXE6sA5oaNyqavEFh0oFLwV6x9wOsXdh8fyHiX3AeuQV8I1vGvs1dyxacEqvZvnuv0o9duunmGEgkG7jJ4xEmCIJIvBKxlUdQGirYQMI+ndvrGRCxRFY+yE/7EO2qabCgJPz2WXLOJkf1sT/pnM6Ps1HlxCuA0w+gdCJYHMnZpwohrcMcwCDeCyRxW9bLbvKUK/Rzhx7bRtGSEqLgpKmxEvoRx925sxiQ+hW7kkmRUKc1XFi3N3ApenHLOA/IfWkjr55b1z+1Hq7zu4Q69htwrxSS2X3cLOwb+dEPbGcZr5XzeuTM9PWg5v/CsdLnltdDRT0eonvyaW/Y1D456UJRy99eipxDuSAzt+kLUTWIwjJAtEml+6fEph0x5DjNi3FfR5DQllik4sFUGoLIzHdj8X8MyhOFvr8FY+1nE9rovX+9pLC9DIFfxp94z1rqzPJWZQpE97QKFxI44esFsCpTbrXeyqf48rqIDGe72FDvCmcnmppy5czO/D+14rB3viMtfOdEHnJwtZG2+lVKjFFTTupGqbwTs2BSAMSIAjpZyHlI0m1M3jI3V5N5qJKfK429yGiwSoGEuHkkBiJGmIcCTh6rsVCWI5bMncupwrrVoDMTh3+myKLgnXkWAEmRdu7QqkoOfqLYaROccrW6rLgl6LMpZDk7CjFaSbiWRFYelFPw+DkJas5Oy4CMKzk73PtsDG1nCC1rWr9iwKsL7f3BG1mOwv86hh35NdZvPptVeVfytvxFT3FfsuOHNw/mMYSIcDI09jzSbpo4I9z0A==
+    alertmanager.yaml: AgAaU6FQ7B/pKqRSfNFKYOXc808/ZQnYXiAJIzX34bHmJymNeNe90c/RCEJPRrorSEsACgDVThKiU3Kbulp08Y4oJHEpJMFOf+Nb3ADMh8pqJgVC3VHuY7n+P2C6QhYBBV2f8TEPRji7/52pkdofpmyizMP4wOCL804fWpzMjZDmfE9O0U72uxD0h0BZLLavyd+UlV9cB4pDFqcZvQ0O8B/JsyL9beMX9QytUCJzibI4d5Z9KMGJbFY+iXXzFGoYfr2uQwyfMSnQ5XZukggXejyKxba3NEN8E1vAjyUof/ytx9bjTt6G69O4F8ky77iAEyYjdoOwmzQriJoWLvueSTT0o3kfI2NbUskxl7HeIvEuX7AKG3mCDxeOZBD70DhZzUpZQAxhO5DG5MtKSjWb/A8QfD7PeFot05xK4u5X4a6p7aywRsxLd8PyKEWDLGp8ozWbPqcNBH0KPZN8tuJdmic8TSVUD6Gzk33ROHdVtaECUSXhA3FVZtW8kDnW+OA/6AD4iJYkYROYg852KviCy1Q27wYR0fklZ01QzdLax5P3VanRY7KiLBECwtMXDA1HFrpirYdcgt4wyaIoFAK5sIS1kSyieN8iM1iyNwhFR2i608cMbr9SKDOJNfmA3Gv4WDdiI36zXsnQyhLnSFYk3J+rf1fsV7i/W6FWIhsj9nmzn6A3ki9EohZGkP/pZ8zZVxQ53eaBbDELlruCfL1uV/zf5xxvIhHlaASBM3tzt4zuTl7mYHvf/52VreM4NRruHk+/yIwRdd/xYfsO8BHg6EiF45Ye+R9jvzCyZG26cYJvM1XbH9VF3kVnbFkh8PXQTSonnx5AMoC0Pbgwm1C+Dtbhe5G2eOdJ2nKs3EO0PbK0iwSmuo8hkTQ+4JWf3EFzqJXshxITeiWlgsJNecT6S3fK30/cl0/zUOZ9nIID7buDdBeWuOpPJJA9yoF2mTqgCujFjxSnFjUg/2PVB1d+N/lExifkZFt0kguqdhreB2w6Ut2F2t17glIR0AROaYMd/SzWw94Kr3V6AEx/Tcly+iVf2gvUQQ5D5+hpLXF1xlzaWD2WN5Lt8eF1VtQe98+o1gNEvbIvp7moc9qbENmam6Y6HEBgyuYhd7SRzCDZPFWQvj4Y/kOpRRL6fKR8GtrjKFY+EDVOmVJBCgyeMDO1iNarX2wEFJ5whThIHX9+mLw+JnS79osOdNxPl5LQRfgaXCuYdJIM7YWPKsl8UJUriHBbziSvQAEj8Ti7rq98Fiigbl7PMg+SCy8yDHVtrw+bZLMZSsMGtQ4c0ciwGxojb8QBD5pEG8jTKXCqIbkJHnjEg0soIi6Wr3+oqBHef6lC447S2xYBkh7DWcD/2l+NSA+/Zc1T2Shm6doxLsJ0MXsgKEiZKyBsLPVIS5AJBYUtRkywzv4GDFPAeSBFGEmfImT7yXX9JhHi0ZJmsyHfFJw/JnwoIucMSeApmZrRxZJtqIfGyJOKKSOStYzWjvihBWYeB3kFdQLrz+0HACfoxjDL0Y2XZBcRd0bDgA+leiM1+ebX9CXta4tBQ9JxVt0uQ1H6W8bOEz9rfBS7/pZ4ScU2oLQB5HDBM1ymTPXnY599oi0beLTaPTHEatcuWvz4wPOonhwDfgyxsFvxHh+HoQYkqYmJIPoibIAa4xh5OeKp6jrsbxZli4Xu6lQjwqeRPPx7K+eOGau1e4T1mA2bwh6aNtqW1Q==
  template:
    metadata:
      creationTimestamp: null
--- a/monitoring/manifests/grafana-dashboardDefinitions.yaml
+++ b/monitoring/manifests/grafana-dashboardDefinitions.yaml
@ -5796,7 +5796,7 @@ items:
                          ],
                          "targets": [
                              {
-                                  "expr": "count(mixin_pod_workload{cluster=\"$cluster\"}) by (namespace)",
+                                  "expr": "sum(kube_pod_owner{cluster=\"$cluster\"}) by (namespace)",
                                  "format": "table",
                                  "instant": true,
                                  "intervalFactor": 2,
@ -6215,7 +6215,7 @@ items:
                          ],
                          "targets": [
                              {
-                                  "expr": "count(mixin_pod_workload{cluster=\"$cluster\"}) by (namespace)",
+                                  "expr": "sum(kube_pod_owner{cluster=\"$cluster\"}) by (namespace)",
                                  "format": "table",
                                  "instant": true,
                                  "intervalFactor": 2,
--- a/monitoring/vendor/github.com/grafana/grafonnet-lib/grafonnet/graph_panel.libsonnet
+++ b/monitoring/vendor/github.com/grafana/grafonnet-lib/grafonnet/graph_panel.libsonnet
@ -11,14 +11,16 @@
   * @param fill Fill, integer from 0 to 10
   * @param linewidth Line Width, integer from 0 to 10
   * @param decimals Override automatic decimal precision for legend and tooltip. If null, not added to the json output.
+   * @param decimals1Y Override automatic decimal precision for the first Y axis. If null, use decimals parameter.
+   * @param decimals2Y Override automatic decimal precision for the second Y axis. If null, use decimals parameter.
   * @param min_span Min span
   * @param format Unit of the Y axes
-   * @param formatY1 Unit of the first Y axe
-   * @param formatY2 Unit of the second Y axe
+   * @param formatY1 Unit of the first Y axis
+   * @param formatY2 Unit of the second Y axis
   * @param min Min of the Y axes
   * @param max Max of the Y axes
-   * @param labelY1 Label of the first Y axe
-   * @param labelY2 Label of the second Y axe
+   * @param labelY1 Label of the first Y axis
+   * @param labelY2 Label of the second Y axis
   * @param x_axis_mode X axis mode, one of [time, series, histogram]
   * @param x_axis_values Chosen value of series, one of [avg, min, max, total, count]
   * @param x_axis_buckets restricts the x axis to this amount of buckets
@ -28,6 +30,7 @@
   * @param points Display points, boolean
   * @param pointradius Radius of the points, allowed values are 0.5 or [1 ... 10] with step 1
   * @param bars Display bars, boolean
+   * @param staircase Display line as staircase, boolean
   * @param dashes Display line as dashes
   * @param stack Stack values
   * @param repeat Variable used to repeat the graph panel
@ -45,8 +48,8 @@
   * @param legend_sortDesc Sort legend descending
   * @param aliasColors Define color mappings for graphs
   * @param thresholds Configuration of graph thresholds
-   * @param logBase1Y Value of logarithm base of the first Y axe
-   * @param logBase2Y Value of logarithm base of the second Y axe
+   * @param logBase1Y Value of logarithm base of the first Y axis
+   * @param logBase2Y Value of logarithm base of the second Y axis
   * @param transparent Boolean (default: false) If set to true the panel will be transparent
   * @param value_type Type of tooltip value
   * @param shared_tooltip Boolean Allow to group or spit tooltips on mouseover within a chart
@ -59,6 +62,8 @@
    fill=1,
    linewidth=1,
    decimals=null,
+    decimalsY1=null,
+    decimalsY2=null,
    description=null,
    min_span=null,
    format='short',
@ -78,6 +83,7 @@
    points=false,
    pointradius=5,
    bars=false,
+    staircase=false,
    height=null,
    nullPointMode='null',
    dashes=false,
@ -124,8 +130,22 @@
    [if height != null then 'height']: height,
    renderer: 'flot',
    yaxes: [
-      self.yaxe(if formatY1 != null then formatY1 else format, min, max, decimals=decimals, logBase=logBase1Y, label=labelY1),
-      self.yaxe(if formatY2 != null then formatY2 else format, min, max, decimals=decimals, logBase=logBase2Y, label=labelY2),
+      self.yaxe(
+        if formatY1 != null then formatY1 else format,
+        min,
+        max,
+        decimals=(if decimalsY1 != null then decimalsY1 else decimals),
+        logBase=logBase1Y,
+        label=labelY1
+      ),
+      self.yaxe(
+        if formatY2 != null then formatY2 else format,
+        min,
+        max,
+        decimals=(if decimalsY2 != null then decimalsY2 else decimals),
+        logBase=logBase2Y,
+        label=labelY2
+      ),
    ],
    xaxis: {
      show: show_xaxis,
@ -164,7 +184,7 @@
      [if legend_sortDesc != null then 'sortDesc']: legend_sortDesc,
    },
    nullPointMode: nullPointMode,
-    steppedLine: false,
+    steppedLine: staircase,
    tooltip: {
      value_type: value_type,
      shared: shared_tooltip,
--- a/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/cluster.libsonnet
+++ b/monitoring/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/cluster.libsonnet
@ -39,7 +39,7 @@ local template = grafana.template;


      local podWorkloadColumns = [
-        'count(mixin_pod_workload{%(clusterLabel)s="$cluster"}) by (namespace)' % $._config,
+        'sum(kube_pod_owner{%(clusterLabel)s="$cluster"}) by (namespace)' % $._config,
        'count(avg(mixin_pod_workload{%(clusterLabel)s="$cluster"}) by (workload, namespace)) by (namespace)' % $._config,
      ];