Merge pull request #1627 from porter-dev/main

new grafana to prod

Author: portersupport

addons/grafana/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: grafana
-version: 0.9.0
-appVersion: 11.1.3
+version: 0.9.1
+appVersion: 12.2.1
 kubeVersion: "^1.8.0-0"
 description: The leading tool for querying and visualizing time series and metrics.
 home: https://grafana.com

addons/grafana/dashboards/application_logs.json

@@ -18,7 +18,7 @@
     "editable": true,
     "fiscalYearStartMonth": 0,
     "graphTooltip": 0,
-    "id": 4,
+    "id": null,
     "links": [],
     "liveNow": true,
     "panels": [
@@ -28,7 +28,7 @@
           "uid": "P982945308D3682D1"
         },
         "gridPos": {
-          "h": 4,
+          "h": 3,
           "w": 24,
           "x": 0,
           "y": 0
@@ -130,7 +130,7 @@
               "uid": "P982945308D3682D1"
             },
             "editorMode": "builder",
-            "expr": "sum by(porter_run_app_name, porter_run_service_name) (count_over_time({porter_run_app_name!=\"\", porter_run_service_name=~\"$service\"} | porter_run_app_name=`$app` [$__interval]))",
+            "expr": "sum by(porter_run_app_name, porter_run_service_name) (count_over_time({porter_run_app_name=~\"$app\", porter_run_service_name=~\"$service\"} [$__interval]))",
             "queryType": "range",
             "refId": "A"
           }
@@ -155,7 +155,7 @@
           "dedupStrategy": "none",
           "enableLogDetails": true,
           "prettifyLogMessage": true,
-          "showCommonLabels": false,
+          "showCommonLabels": true,
           "showLabels": true,
           "showTime": true,
           "sortOrder": "Descending",
@@ -168,85 +168,16 @@
               "uid": "P982945308D3682D1"
             },
             "editorMode": "builder",
-            "expr": "{porter_run_app_name!=\"\", porter_run_service_name=~\"$service\"} |= \"${search:pipe}\" | porter_run_app_name=`$app`",
+            "expr": "{porter_run_app_name=~\"$app\", porter_run_service_name=~\"$service\"} |= \"${search:pipe}\"",
             "queryType": "range",
             "refId": "A"
           }
         ],
         "title": "Application Logs",
         "type": "logs"
-      },
-      {
-        "datasource": {
-          "type": "loki",
-          "uid": "P982945308D3682D1"
-        },
-        "description": "Log level distribution",
-        "fieldConfig": {
-          "defaults": {
-            "color": {
-              "mode": "palette-classic"
-            },
-            "custom": {
-              "hideFrom": {
-                "legend": false,
-                "tooltip": false,
-                "viz": false
-              }
-            },
-            "mappings": []
-          },
-          "overrides": []
-        },
-        "gridPos": {
-          "h": 8,
-          "w": 12,
-          "x": 0,
-          "y": 22
-        },
-        "id": 2,
-        "options": {
-          "displayLabels": [
-            "value"
-          ],
-          "legend": {
-            "displayMode": "list",
-            "placement": "right",
-            "showLegend": true,
-            "values": [
-              "value"
-            ]
-          },
-          "pieType": "pie",
-          "reduceOptions": {
-            "calcs": [
-              "lastNotNull"
-            ],
-            "fields": "",
-            "values": false
-          },
-          "tooltip": {
-            "mode": "single",
-            "sort": "none"
-          }
-        },
-        "targets": [
-          {
-            "datasource": {
-              "type": "loki",
-              "uid": "P982945308D3682D1"
-            },
-            "editorMode": "builder",
-            "expr": "sum by(level) (count_over_time({porter_run_app_name!=\"\", porter_run_service_name=~\"$service\"} | porter_run_app_name=`$app` | pattern `<_> level=<level> <_>` [$__range]))",
-            "queryType": "range",
-            "refId": "A"
-          }
-        ],
-        "title": "Log Levels Distribution",
-        "type": "piechart"
       }
     ],
-    "refresh": "10s",
+    "refresh": "5m",
     "schemaVersion": 39,
     "tags": [
       "logs",
@@ -264,14 +195,14 @@
             "type": "loki",
             "uid": "P982945308D3682D1"
           },
-          "definition": "label_values({porter_run_app_name!=\"\"}, porter_run_app_name)",
+          "definition": "label_values(porter_run_app_name)",
           "hide": 0,
           "includeAll": true,
           "label": "Application",
           "multi": false,
           "name": "app",
           "options": [],
-          "query": "label_values({porter_run_app_name!=\"\"}, porter_run_app_name)",
+          "query": "label_values(porter_run_app_name)",
           "refresh": 2,
           "regex": "",
           "skipUrlSync": false,
@@ -325,7 +256,7 @@
       ]
     },
     "time": {
-      "from": "now-3h",
+      "from": "now-1h",
       "to": "now"
     },
     "timepicker": {

addons/postgresql-managed/values.yaml

@@ -96,8 +96,8 @@ diagnosticMode:
 ## @param image.debug Specify if debug values should be set
 ##
 image:
-  registry: docker.io
-  repository: porterhub/postgresql-managed
+  registry: ghcr.io
+  repository: porter-dev/postgres-extensions
   tag: 16.1.0-debian-11-r16
   digest: ""
   ## Specify a imagePullPolicy