Commit a438f2e9 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

updated grafana dashboards provisioning + repocfg & meepctl version

parent 5e4bb7a1
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

version: 1.6.4
version: 1.6.5
repo:
  name: AdvantEDGE

@@ -82,6 +82,13 @@ repo:
        # OAuth k8s secret (data: client-id, secret)
        secret: meep-oauth-gitlab

    # Default monitoring dashboards
    dashboards:
      network-metrics-point-to-point: dashboards/network-metrics-point-to-point.json
      network-metrics-aggregation: dashboards/network-metrics-aggregation.json
      http-single-log: dashboards/http-log-byId.json
      http-logs-aggregation: dashboards/http-loggers.json

  #------------------------------
  #  Resource Prerequisites
  #------------------------------
+106 −23
Original line number Diff line number Diff line
{
  "annotations": {
    "list": [
      {
        "builtIn": 1,
        "datasource": "-- Grafana --",
        "enable": true,
        "hide": true,
        "iconColor": "rgba(0, 211, 255, 1)",
        "name": "Annotations & Alerts",
        "type": "dashboard"
      }
    ]
  },
  "editable": true,
  "gnetId": null,
  "graphTooltip": 0,
  "iteration": 1588086315506,
  "id": 9,
  "iteration": 1612541702849,
  "links": [],
  "panels": [
    {
      "cacheTimeout": null,
      "columns": [],
      "datasource": "$datasource",
      "fieldConfig": {
        "defaults": {
          "custom": {}
        },
        "overrides": []
      },
      "fontSize": "100%",
      "gridPos": {
        "h": 2,
        "w": 24,
        "x": 0,
        "y": 1
        "y": 0
      },
      "id": 5,
      "links": [],
      "options": {},
      "pageSize": null,
      "pluginVersion": "6.4.2",
      "showHeader": true,
@@ -29,12 +48,14 @@
      "styles": [
        {
          "alias": "Time",
          "align": "auto",
          "dateFormat": "YYYY-MM-DD HH:mm:ss",
          "pattern": "Time",
          "type": "date"
        },
        {
          "alias": "Type",
          "align": "auto",
          "colorMode": null,
          "colors": [
            "#C4162A",
@@ -61,6 +82,7 @@
        },
        {
          "alias": "Id",
          "align": "auto",
          "colorMode": null,
          "colors": [
            "rgba(245, 54, 54, 0.9)",
@@ -77,6 +99,7 @@
        },
        {
          "alias": "Service",
          "align": "auto",
          "colorMode": null,
          "colors": [
            "rgba(245, 54, 54, 0.9)",
@@ -93,6 +116,7 @@
        },
        {
          "alias": "Method",
          "align": "auto",
          "colorMode": null,
          "colors": [
            "rgba(245, 54, 54, 0.9)",
@@ -109,6 +133,7 @@
        },
        {
          "alias": "Endpoint with query parameterers",
          "align": "auto",
          "colorMode": null,
          "colors": [
            "rgba(245, 54, 54, 0.9)",
@@ -125,6 +150,7 @@
        },
        {
          "alias": "Response code",
          "align": "auto",
          "colorMode": null,
          "colors": [
            "rgba(245, 54, 54, 0.9)",
@@ -141,6 +167,7 @@
        },
        {
          "alias": "Processing Time (us)",
          "align": "auto",
          "colorMode": null,
          "colors": [
            "rgba(245, 54, 54, 0.9)",
@@ -174,20 +201,28 @@
      "timeShift": null,
      "title": "",
      "transform": "timeseries_to_columns",
      "type": "table"
      "type": "table-old"
    },
    {
      "content": "",
      "datasource": null,
      "fieldConfig": {
        "defaults": {
          "custom": {}
        },
        "overrides": []
      },
      "gridPos": {
        "h": 1,
        "w": 24,
        "x": 0,
        "y": 3
        "y": 2
      },
      "id": 30,
      "mode": "markdown",
      "options": {},
      "options": {
        "content": "",
        "mode": "markdown"
      },
      "pluginVersion": "7.3.5",
      "timeFrom": null,
      "timeShift": null,
      "title": "Request Body",
@@ -197,17 +232,25 @@
      "cacheTimeout": null,
      "datasource": "$datasource",
      "description": "",
      "fieldConfig": {
        "defaults": {
          "custom": {}
        },
        "overrides": []
      },
      "gridPos": {
        "h": 5,
        "w": 24,
        "x": 0,
        "y": 4
        "y": 3
      },
      "id": 31,
      "links": [],
      "options": {
        "showLabels": false,
        "showTime": false,
        "sortOrder": "Descending"
        "sortOrder": "Descending",
        "wrapLogMessage": false
      },
      "pluginVersion": "6.5.2",
      "targets": [
@@ -242,17 +285,25 @@
      "type": "logs"
    },
    {
      "content": "",
      "datasource": null,
      "fieldConfig": {
        "defaults": {
          "custom": {}
        },
        "overrides": []
      },
      "gridPos": {
        "h": 1,
        "w": 24,
        "x": 0,
        "y": 9
        "y": 8
      },
      "id": 32,
      "mode": "markdown",
      "options": {},
      "options": {
        "content": "",
        "mode": "markdown"
      },
      "pluginVersion": "7.3.5",
      "timeFrom": null,
      "timeShift": null,
      "title": "Response Body",
@@ -262,17 +313,25 @@
      "cacheTimeout": null,
      "datasource": "$datasource",
      "description": "",
      "fieldConfig": {
        "defaults": {
          "custom": {}
        },
        "overrides": []
      },
      "gridPos": {
        "h": 5,
        "w": 24,
        "x": 0,
        "y": 10
        "y": 9
      },
      "id": 33,
      "links": [],
      "options": {
        "showLabels": false,
        "showTime": false,
        "sortOrder": "Descending"
        "sortOrder": "Descending",
        "wrapLogMessage": false
      },
      "pluginVersion": "6.5.2",
      "targets": [
@@ -308,16 +367,18 @@
    }
  ],
  "refresh": "",
  "schemaVersion": 21,
  "schemaVersion": 26,
  "style": "dark",
  "tags": [],
  "templating": {
    "list": [
      {
        "current": {
          "selected": false,
          "text": "meep-influxdb",
          "value": "meep-influxdb"
        },
        "error": null,
        "hide": 0,
        "includeAll": false,
        "label": "",
@@ -333,11 +394,13 @@
      {
        "allValue": null,
        "current": {
          "text": "demo1",
          "value": "demo1"
          "selected": false,
          "text": "_internal",
          "value": "_internal"
        },
        "datasource": "$datasource",
        "definition": "show databases",
        "error": null,
        "hide": 0,
        "includeAll": false,
        "label": null,
@@ -358,11 +421,14 @@
      {
        "allValue": "ALL",
        "current": {
          "text": "ALL",
          "value": "*"
          "isNone": true,
          "selected": false,
          "text": "None",
          "value": ""
        },
        "datasource": "$datasource",
        "definition": "show tag values on $database from http with key = \"logger_name\"",
        "error": null,
        "hide": 0,
        "includeAll": false,
        "label": "service",
@@ -388,6 +454,18 @@
        },
        "datasource": "$datasource",
        "definition": "show http log id selected",
        "error": {
          "data": {
            "executedQueryString": "SELECT id FROM _internal.autogen.http WHERE (\"logger_name\" =~ /^$/) ORDER BY time desc LIMIT 100",
            "results": [
              {
                "error": "retention policy not found: autogen",
                "statement_id": 0
              }
            ]
          },
          "message": "InfluxDB Error: retention policy not found: autogen"
        },
        "hide": 0,
        "includeAll": false,
        "label": "http log Id",
@@ -407,8 +485,13 @@
      }
    ]
  },
  "time": {
    "from": "now-6h",
    "to": "now"
  },
  "timepicker": {},
  "timezone": "",
  "title": "Http REST API single log details",
  "uid": "4",
  "uid": "meep-http-log-details",
  "version": 1
}
 No newline at end of file
+47 −14
Original line number Diff line number Diff line
{
  "annotations": {
    "list": [
      {
        "builtIn": 1,
        "datasource": "-- Grafana --",
        "enable": true,
        "hide": true,
        "iconColor": "rgba(0, 211, 255, 1)",
        "name": "Annotations & Alerts",
        "type": "dashboard"
      }
    ]
  },
  "editable": true,
  "gnetId": null,
  "graphTooltip": 0,
  "iteration": 1588000376431,
  "id": 8,
  "iteration": 1612541639484,
  "links": [],
  "panels": [
    {
      "cacheTimeout": null,
      "columns": [],
      "datasource": "$datasource",
      "fieldConfig": {
        "defaults": {
          "custom": {}
        },
        "overrides": []
      },
      "fontSize": "100%",
      "gridPos": {
        "h": 6,
        "w": 24,
        "x": 0,
        "y": 3
        "y": 0
      },
      "id": 4,
      "links": [],
      "options": {},
      "pageSize": null,
      "pluginVersion": "6.4.2",
      "showHeader": true,
@@ -29,12 +48,14 @@
      "styles": [
        {
          "alias": "Time",
          "align": "auto",
          "dateFormat": "YYYY-MM-DD HH:mm:ss",
          "pattern": "Time",
          "type": "date"
        },
        {
          "alias": "Type",
          "align": "auto",
          "colorMode": null,
          "colors": [
            "#C4162A",
@@ -61,6 +82,7 @@
        },
        {
          "alias": "Id",
          "align": "auto",
          "colorMode": null,
          "colors": [
            "rgba(245, 54, 54, 0.9)",
@@ -81,6 +103,7 @@
        },
        {
          "alias": "Service",
          "align": "auto",
          "colorMode": null,
          "colors": [
            "rgba(245, 54, 54, 0.9)",
@@ -97,6 +120,7 @@
        },
        {
          "alias": "Endpoint",
          "align": "auto",
          "colorMode": null,
          "colors": [
            "rgba(245, 54, 54, 0.9)",
@@ -113,6 +137,7 @@
        },
        {
          "alias": "Response code",
          "align": "auto",
          "colorMode": null,
          "colors": [
            "rgba(245, 54, 54, 0.9)",
@@ -129,6 +154,7 @@
        },
        {
          "alias": "Processing Time (us)",
          "align": "auto",
          "colorMode": null,
          "colors": [
            "rgba(245, 54, 54, 0.9)",
@@ -162,20 +188,22 @@
      "timeShift": null,
      "title": "Http logs",
      "transform": "timeseries_to_columns",
      "type": "table"
      "type": "table-old"
    }
  ],
  "refresh": "1s",
  "schemaVersion": 21,
  "refresh": "5s",
  "schemaVersion": 26,
  "style": "dark",
  "tags": [],
  "templating": {
    "list": [
      {
        "current": {
          "selected": false,
          "text": "meep-influxdb",
          "value": "meep-influxdb"
        },
        "error": null,
        "hide": 0,
        "includeAll": false,
        "label": "",
@@ -191,11 +219,13 @@
      {
        "allValue": null,
        "current": {
          "text": "demo1",
          "value": "demo1"
          "selected": false,
          "text": "_internal",
          "value": "_internal"
        },
        "datasource": "$datasource",
        "definition": "show databases",
        "error": null,
        "hide": 0,
        "includeAll": false,
        "label": null,
@@ -216,11 +246,14 @@
      {
        "allValue": "ALL",
        "current": {
          "text": "ALL",
          "value": "*"
          "isNone": true,
          "selected": false,
          "text": "None",
          "value": ""
        },
        "datasource": "$datasource",
        "definition": "show tag values on $database from http with key = \"logger_name\"",
        "error": null,
        "hide": 0,
        "includeAll": false,
        "label": "service",
@@ -262,6 +295,6 @@
  },
  "timezone": "",
  "title": "Http REST API logs aggregation",
  "uid": "3",
  "uid": "meep-http-logs-aggregation",
  "version": 1
}
 No newline at end of file
+54 −17
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@
  "editable": true,
  "gnetId": null,
  "graphTooltip": 0,
  "iteration": 1582319088471,
  "id": 6,
  "iteration": 1612541765923,
  "links": [],
  "panels": [
    {
@@ -55,6 +56,13 @@
      "dashes": false,
      "datasource": "$datasource",
      "description": "Shows latency & Throughput between source & destination applications",
      "fieldConfig": {
        "defaults": {
          "custom": {},
          "links": []
        },
        "overrides": []
      },
      "fill": 0,
      "fillGradient": 1,
      "gridPos": {
@@ -80,10 +88,10 @@
      "links": [],
      "nullPointMode": "connected",
      "options": {
        "dataLinks": []
        "alertThreshold": true
      },
      "percentage": false,
      "pluginVersion": "6.4.2",
      "pluginVersion": "7.3.5",
      "pointradius": 2,
      "points": false,
      "renderer": "flot",
@@ -208,6 +216,13 @@
      "dashes": false,
      "datasource": "$datasource",
      "description": "Shows Up-Link Throughput from selected source",
      "fieldConfig": {
        "defaults": {
          "custom": {},
          "links": []
        },
        "overrides": []
      },
      "fill": 0,
      "fillGradient": 4,
      "gridPos": {
@@ -233,10 +248,10 @@
      "links": [],
      "nullPointMode": "connected",
      "options": {
        "dataLinks": []
        "alertThreshold": true
      },
      "percentage": false,
      "pluginVersion": "6.4.2",
      "pluginVersion": "7.3.5",
      "pointradius": 2,
      "points": false,
      "renderer": "flot",
@@ -348,6 +363,13 @@
      "dashes": false,
      "datasource": "$datasource",
      "description": "Shows Down-Link Throughput to selected source",
      "fieldConfig": {
        "defaults": {
          "custom": {},
          "links": []
        },
        "overrides": []
      },
      "fill": 0,
      "fillGradient": 4,
      "gridPos": {
@@ -373,10 +395,10 @@
      "links": [],
      "nullPointMode": "connected",
      "options": {
        "dataLinks": []
        "alertThreshold": true
      },
      "percentage": false,
      "pluginVersion": "6.4.2",
      "pluginVersion": "7.3.5",
      "pointradius": 2,
      "points": false,
      "renderer": "flot",
@@ -498,6 +520,12 @@
      "cacheTimeout": null,
      "columns": [],
      "datasource": "$datasource",
      "fieldConfig": {
        "defaults": {
          "custom": {}
        },
        "overrides": []
      },
      "fontSize": "100%",
      "gridPos": {
        "h": 6,
@@ -507,7 +535,6 @@
      },
      "id": 4,
      "links": [],
      "options": {},
      "pageSize": null,
      "pluginVersion": "6.4.2",
      "showHeader": true,
@@ -518,12 +545,14 @@
      "styles": [
        {
          "alias": "Time",
          "align": "auto",
          "dateFormat": "YYYY-MM-DD HH:mm:ss",
          "pattern": "Time",
          "type": "date"
        },
        {
          "alias": "Type",
          "align": "auto",
          "colorMode": null,
          "colors": [
            "#C4162A",
@@ -550,6 +579,7 @@
        },
        {
          "alias": "Description",
          "align": "auto",
          "colorMode": null,
          "colors": [
            "rgba(245, 54, 54, 0.9)",
@@ -593,20 +623,22 @@
      "timeShift": null,
      "title": "Events",
      "transform": "timeseries_to_columns",
      "type": "table"
      "type": "table-old"
    }
  ],
  "refresh": "1s",
  "schemaVersion": 21,
  "refresh": "5s",
  "schemaVersion": 26,
  "style": "dark",
  "tags": [],
  "templating": {
    "list": [
      {
        "current": {
          "selected": false,
          "text": "meep-influxdb",
          "value": "meep-influxdb"
        },
        "error": null,
        "hide": 0,
        "includeAll": false,
        "label": "",
@@ -622,11 +654,13 @@
      {
        "allValue": null,
        "current": {
          "text": "demo1",
          "value": "demo1"
          "selected": false,
          "text": "_internal",
          "value": "_internal"
        },
        "datasource": "$datasource",
        "definition": "show databases",
        "error": null,
        "hide": 0,
        "includeAll": false,
        "label": null,
@@ -647,11 +681,14 @@
      {
        "allValue": null,
        "current": {
          "text": "ue1-iperf",
          "value": "ue1-iperf"
          "isNone": true,
          "selected": false,
          "text": "None",
          "value": ""
        },
        "datasource": "$datasource",
        "definition": "show tag values on $database from network with key = \"src\"",
        "error": null,
        "hide": 0,
        "includeAll": false,
        "label": "",
@@ -693,6 +730,6 @@
  },
  "timezone": "",
  "title": "Network Metrics Aggregation",
  "uid": "2",
  "version": 3
  "uid": "meep-network-aggregation",
  "version": 1
}
 No newline at end of file
+81 −25
Original line number Diff line number Diff line
@@ -30,13 +30,18 @@
  "editable": true,
  "gnetId": null,
  "graphTooltip": 0,
  "id": 1,
  "iteration": 1581094956679,
  "id": 7,
  "iteration": 1612541817817,
  "links": [],
  "panels": [
    {
      "content": "\n\n",
      "datasource": null,
      "fieldConfig": {
        "defaults": {
          "custom": {}
        },
        "overrides": []
      },
      "gridPos": {
        "h": 1,
        "w": 8,
@@ -44,16 +49,24 @@
        "y": 0
      },
      "id": 14,
      "mode": "markdown",
      "options": {},
      "options": {
        "content": "\n\n",
        "mode": "markdown"
      },
      "pluginVersion": "7.3.5",
      "timeFrom": null,
      "timeShift": null,
      "title": "Latency",
      "type": "text"
    },
    {
      "content": "",
      "datasource": null,
      "fieldConfig": {
        "defaults": {
          "custom": {}
        },
        "overrides": []
      },
      "gridPos": {
        "h": 1,
        "w": 16,
@@ -61,8 +74,11 @@
        "y": 0
      },
      "id": 12,
      "mode": "markdown",
      "options": {},
      "options": {
        "content": "",
        "mode": "markdown"
      },
      "pluginVersion": "7.3.5",
      "timeFrom": null,
      "timeShift": null,
      "title": "Throughput",
@@ -80,6 +96,12 @@
      "datasource": "$datasource",
      "decimals": null,
      "description": "",
      "fieldConfig": {
        "defaults": {
          "custom": {}
        },
        "overrides": []
      },
      "format": "none",
      "gauge": {
        "maxValue": 100,
@@ -111,7 +133,6 @@
      "maxDataPoints": 100,
      "nullPointMode": "connected",
      "nullText": null,
      "options": {},
      "pluginVersion": "6.5.2",
      "postfix": " ms",
      "postfixFontSize": "50%",
@@ -208,6 +229,12 @@
      "datasource": "$datasource",
      "decimals": 2,
      "description": "",
      "fieldConfig": {
        "defaults": {
          "custom": {}
        },
        "overrides": []
      },
      "format": "none",
      "gauge": {
        "maxValue": 100,
@@ -239,7 +266,6 @@
      "maxDataPoints": 100,
      "nullPointMode": "connected",
      "nullText": null,
      "options": {},
      "pluginVersion": "6.5.2",
      "postfix": " Mbps",
      "postfixFontSize": "50%",
@@ -336,6 +362,12 @@
      "datasource": "$datasource",
      "decimals": 2,
      "description": "",
      "fieldConfig": {
        "defaults": {
          "custom": {}
        },
        "overrides": []
      },
      "format": "none",
      "gauge": {
        "maxValue": 100,
@@ -367,7 +399,6 @@
      "maxDataPoints": 100,
      "nullPointMode": "connected",
      "nullText": null,
      "options": {},
      "pluginVersion": "6.5.2",
      "postfix": " Mbps",
      "postfixFontSize": "50%",
@@ -460,6 +491,13 @@
      "dashes": false,
      "datasource": "$datasource",
      "description": "Shows latency & Throughput between source & destination applications",
      "fieldConfig": {
        "defaults": {
          "custom": {},
          "links": []
        },
        "overrides": []
      },
      "fill": 2,
      "fillGradient": 4,
      "gridPos": {
@@ -485,10 +523,10 @@
      "links": [],
      "nullPointMode": "connected",
      "options": {
        "dataLinks": []
        "alertThreshold": true
      },
      "percentage": false,
      "pluginVersion": "6.4.2",
      "pluginVersion": "7.3.5",
      "pointradius": 2,
      "points": false,
      "renderer": "flot",
@@ -696,6 +734,12 @@
      "cacheTimeout": null,
      "columns": [],
      "datasource": "$datasource",
      "fieldConfig": {
        "defaults": {
          "custom": {}
        },
        "overrides": []
      },
      "fontSize": "100%",
      "gridPos": {
        "h": 6,
@@ -705,7 +749,6 @@
      },
      "id": 4,
      "links": [],
      "options": {},
      "pageSize": null,
      "pluginVersion": "6.4.2",
      "showHeader": true,
@@ -716,12 +759,14 @@
      "styles": [
        {
          "alias": "Time",
          "align": "auto",
          "dateFormat": "YYYY-MM-DD HH:mm:ss",
          "pattern": "Time",
          "type": "date"
        },
        {
          "alias": "Type",
          "align": "auto",
          "colorMode": null,
          "colors": [
            "#C4162A",
@@ -748,6 +793,7 @@
        },
        {
          "alias": "Description",
          "align": "auto",
          "colorMode": null,
          "colors": [
            "rgba(245, 54, 54, 0.9)",
@@ -791,20 +837,22 @@
      "timeShift": null,
      "title": "Events",
      "transform": "timeseries_to_columns",
      "type": "table"
      "type": "table-old"
    }
  ],
  "refresh": "1s",
  "schemaVersion": 21,
  "refresh": "5s",
  "schemaVersion": 26,
  "style": "dark",
  "tags": [],
  "templating": {
    "list": [
      {
        "current": {
          "selected": false,
          "text": "meep-influxdb",
          "value": "meep-influxdb"
        },
        "error": null,
        "hide": 0,
        "includeAll": false,
        "label": "",
@@ -820,11 +868,13 @@
      {
        "allValue": null,
        "current": {
          "text": "demo1",
          "value": "demo1"
          "selected": false,
          "text": "_internal",
          "value": "_internal"
        },
        "datasource": "$datasource",
        "definition": "show databases",
        "error": null,
        "hide": 0,
        "includeAll": false,
        "label": null,
@@ -845,11 +895,14 @@
      {
        "allValue": null,
        "current": {
          "text": "ue1-iperf",
          "value": "ue1-iperf"
          "isNone": true,
          "selected": false,
          "text": "None",
          "value": ""
        },
        "datasource": "$datasource",
        "definition": "show tag values on $database from network with key = \"src\"",
        "error": null,
        "hide": 0,
        "includeAll": false,
        "label": "",
@@ -870,11 +923,14 @@
      {
        "allValue": null,
        "current": {
          "text": "zone1-fog1-iperf",
          "value": "zone1-fog1-iperf"
          "isNone": true,
          "selected": false,
          "text": "None",
          "value": ""
        },
        "datasource": "$datasource",
        "definition": "show tag values on $database from network with key = \"dest\"",
        "error": null,
        "hide": 0,
        "includeAll": false,
        "label": "",
@@ -916,6 +972,6 @@
  },
  "timezone": "",
  "title": "Network Metrics Point-to-Point",
  "uid": "1",
  "version": 5
  "uid": "meep-network-point-to-point",
  "version": 1
}
 No newline at end of file
Loading