Merge pull request #35 from jwcastillo/set_k6_repo_structure

chore: set folder structure like k6 repo

Author: javaducky

docker-compose.yml

@@ -28,9 +28,7 @@ services:
       - GF_AUTH_ANONYMOUS_ENABLED=true
       - GF_AUTH_BASIC_ENABLED=false
     volumes:
-      - ./example/config-datasources.yaml:/etc/grafana/provisioning/datasources/datasource.yaml
-      - ./example/config-dashboards.yaml:/etc/grafana/provisioning/dashboards/dashboards.yaml
-      - ./example/dashboards:/var/lib/grafana/dashboards
+      - ./grafana:/etc/grafana/provisioning/
 
   k6:
     build: .
@@ -43,3 +41,5 @@ services:
       - K6_OUT=output-prometheus-remote
     depends_on:
       - prometheus
+    volumes:
+      - ./samples:/scripts

example/dashboards/README.md renamed to grafana/dashboards/README.md

@@ -24,7 +24,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "iteration": 1657475182972,
+  "iteration": 1660431009407,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -1562,9 +1562,9 @@
       {
         "allValue": "",
         "current": {
-          "selected": true,
-          "text": "test-1657474791",
-          "value": "test-1657474791"
+          "selected": false,
+          "text": "All",
+          "value": "$__all"
         },
         "datasource": {
           "type": "prometheus",
@@ -1581,7 +1581,7 @@
           "query": "label_values(testid)",
           "refId": "StandardVariableQuery"
         },
-        "refresh": 1,
+        "refresh": 2,
         "regex": "",
         "skipUrlSync": false,
         "sort": 1,
@@ -1624,6 +1624,6 @@
   "timezone": "",
   "title": "Test Result",
   "uid": "a21-pyAWz",
-  "version": 3,
+  "version": 1,
   "weekStart": ""
-}
+}

example/dashboards/dashboard-results.json renamed to grafana/dashboards/dashboard-results.json

@@ -24,6 +24,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
+  "iteration": 1660431147457,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -143,8 +144,8 @@
             "type": "prometheus",
             "uid": "PEDF09670F151C95C"
           },
-          "editorMode": "builder",
-          "expr": "k6_http_reqs",
+          "editorMode": "code",
+          "expr": "k6_http_reqs{testid=~\"$testid\"}",
           "format": "table",
           "legendFormat": "__auto",
           "range": true,
@@ -251,7 +252,31 @@
   "style": "dark",
   "tags": [],
   "templating": {
-    "list": []
+    "list": [
+      {
+        "current": {
+          "selected": true,
+          "text": "All",
+          "value": "$__all"
+        },
+        "definition": "label_values(testid)",
+        "hide": 0,
+        "includeAll": true,
+        "label": "Test ID",
+        "multi": false,
+        "name": "testid",
+        "options": [],
+        "query": {
+          "query": "label_values(testid)",
+          "refId": "StandardVariableQuery"
+        },
+        "refresh": 2,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 1,
+        "type": "query"
+      }
+    ]
   },
   "time": {
     "from": "now-1h",
@@ -261,6 +286,6 @@
   "timezone": "",
   "title": "Test Runs List",
   "uid": "UoYDJHJZk",
-  "version": 2,
+  "version": 1,
   "weekStart": ""
-}
+}

example/dashboards/dashboard-tests.json renamed to grafana/dashboards/dashboard-tests.json

@@ -1,15 +1,14 @@
-# For configuration options, see 
+# For configuration options, see
 #   https://grafana.com/docs/grafana/latest/administration/provisioning/#dashboards
 
 apiVersion: 1
 
 providers:
   # We're defining a directory from which to load file-based dashboards
-  - name: 'a unique provider name'
+  - name: 'prometheus-in-docker'
     type: file
     disableDeletion: false
     updateIntervalSeconds: 10
-    allowUiUpdates: false
+    editable: true
     options:
-      path: /var/lib/grafana/dashboards
-      foldersFromFilesStructure: true
+      path: /etc/grafana/provisioning/dashboards

example/config-dashboards.yaml renamed to grafana/dashboards/dashboards.yaml

@@ -24,7 +24,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 1,
-  "iteration": 1657476390215,
+  "iteration": 1660431508579,
   "links": [],
   "liveNow": true,
   "panels": [
@@ -796,8 +796,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -886,8 +885,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           },
@@ -942,8 +940,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           },
@@ -1027,8 +1024,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           },
@@ -1231,8 +1227,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           }
@@ -1388,7 +1383,7 @@
       {
         "allValue": "http.*",
         "current": {
-          "selected": true,
+          "selected": false,
           "text": "All",
           "value": "$__all"
         },
@@ -1406,15 +1401,15 @@
           "query": "label_values(url)",
           "refId": "StandardVariableQuery"
         },
-        "refresh": 1,
+        "refresh": 2,
         "regex": "",
         "skipUrlSync": false,
         "sort": 0,
         "type": "query"
       },
       {
         "current": {
-          "selected": true,
+          "selected": false,
           "text": "All",
           "value": "$__all"
         },
@@ -1432,7 +1427,7 @@
           "query": "label_values(scenario)",
           "refId": "StandardVariableQuery"
         },
-        "refresh": 1,
+        "refresh": 2,
         "regex": "",
         "skipUrlSync": false,
         "sort": 0,
@@ -1543,7 +1538,7 @@
           "query": "label_values(method)",
           "refId": "StandardVariableQuery"
         },
-        "refresh": 1,
+        "refresh": 2,
         "regex": "",
         "skipUrlSync": false,
         "sort": 0,
@@ -1559,6 +1554,6 @@
   "timezone": "",
   "title": "PRW output of k6",
   "uid": "5cQoNs67k",
-  "version": 2,
+  "version": 1,
   "weekStart": ""
-}
+}

example/dashboards/default.json renamed to grafana/dashboards/default.json

@@ -0,0 +1,17 @@
+import http from "k6/http";
+import { check } from "k6";
+
+export const options = {
+  vus: 10,
+  duration: '10s',
+  thresholds: {
+    'http_reqs{expected_response:true}': ['rate>10'],
+  },
+};
+
+export default function () {
+  check(http.get("https://test-api.k6.io/"), {
+    "status is 200": (r) => r.status == 200,
+    "protocol is HTTP/2": (r) => r.proto == "HTTP/2.0",
+  });
+}