Skip to content

Commit

Permalink
Merge branch 'js-version' into php-version
Browse files Browse the repository at this point in the history
  • Loading branch information
@asmyasnikov
asmyasnikov authored May 14, 2024
2 parents b420a26 + f8e9068 commit 86fbb2c
Show file tree
Hide file tree
Showing 16 changed files with 1,171 additions and 212 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/check-dist.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set Node.js 16.x
- name: Set Node.js 20.x
uses: actions/[email protected]
with:
node-version: 16.x
node-version: 20.x

- name: Install dependencies
run: npm ci
Expand Down
2 changes: 1 addition & 1 deletion action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,6 @@ inputs:
description: 'SLO workload #5 docker build arguments'
required: false
runs:
using: 'node16'
using: 'node20'
main: 'dist/main/index.js'
post: 'dist/post/index.js'
2 changes: 1 addition & 1 deletion dist/main/index.js
View file

Large diffs are not rendered by default.

113 changes: 41 additions & 72 deletions k8s/helms/grafana.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,6 @@ dashboards:
"links": [],
"liveNow": false,
"panels": [
{
"gridPos": {
"h": 1,
"w": 24,
"x": 0,
"y": 0
},
"id": 9,
"title": "Row title",
"type": "row"
},
{
"datasource": {
"type": "prometheus",
Expand Down Expand Up @@ -168,14 +157,14 @@ dashboards:
"h": 9,
"w": 12,
"x": 0,
"y": 1
"y": 0
},
"id": 2,
"id": 12,
"options": {
"legend": {
"calcs": [],
"displayMode": "table",
"placement": "right",
"displayMode": "list",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
Expand All @@ -190,19 +179,7 @@ dashboards:
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "inflight > 0",
"format": "time_series",
"legendFormat": "({{sdk}}-{{sdkVersion}}) {{jobName}} In flight",
"range": true,
"refId": "A"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "oks > 0",
"expr": "rate(oks[$__rate_interval]) > 0",
"hide": false,
"legendFormat": "({{sdk}}-{{sdkVersion}}) {{jobName}} OK",
"range": true,
Expand All @@ -214,14 +191,14 @@ dashboards:
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "not_oks > 0",
"expr": "rate(not_oks[$__rate_interval]) > 0",
"hide": false,
"legendFormat": "({{sdk}}-{{sdkVersion}}) {{jobName}} not OK",
"range": true,
"refId": "C"
}
],
"title": "SLO Requests",
"title": "SLO Requests RPS",
"transformations": [],
"type": "timeseries"
},
Expand All @@ -240,6 +217,7 @@ dashboards:
"axisColorMode": "text",
"axisLabel": "",
"axisPlacement": "auto",
"axisSoftMin": 0,
"barAlignment": 0,
"drawStyle": "line",
"fillOpacity": 0,
Expand All @@ -265,6 +243,7 @@ dashboards:
"mode": "off"
}
},
"decimals": 0,
"mappings": [],
"thresholds": {
"mode": "absolute",
Expand All @@ -286,14 +265,14 @@ dashboards:
"h": 9,
"w": 12,
"x": 12,
"y": 1
"y": 0
},
"id": 12,
"id": 14,
"options": {
"legend": {
"calcs": [],
"displayMode": "table",
"placement": "right",
"displayMode": "list",
"placement": "bottom",
"showLegend": true
},
"tooltip": {
Expand All @@ -308,38 +287,14 @@ dashboards:
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "delta(inflight[2s]) / 2 > 0",
"format": "time_series",
"legendFormat": "({{sdk}}-{{sdkVersion}}) {{jobName}} In flight",
"range": true,
"refId": "A"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "delta(oks[2s]) / 2 > 0",
"hide": false,
"legendFormat": "({{sdk}}-{{sdkVersion}}) {{jobName}} OK",
"range": true,
"refId": "B"
},
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"editorMode": "builder",
"expr": "changes(not_oks[2s]) > 0",
"expr": "histogram_quantile(1, rate(attempts_bucket[$__rate_interval]))",
"hide": false,
"legendFormat": "({{sdk}}-{{sdkVersion}}) {{jobName}} not OK",
"legendFormat": "{{sdk}}-{{sdkVersion}} {{jobName}}-{{status}}",
"range": true,
"refId": "C"
"refId": "A"
}
],
"title": "SLO Requests RPS",
"title": "Attempts",
"transformations": [],
"type": "timeseries"
},
Expand All @@ -349,7 +304,7 @@ dashboards:
"h": 1,
"w": 24,
"x": 0,
"y": 10
"y": 9
},
"id": 7,
"panels": [],
Expand Down Expand Up @@ -417,7 +372,7 @@ dashboards:
"h": 8,
"w": 12,
"x": 0,
"y": 11
"y": 10
},
"id": 4,
"options": {
Expand Down Expand Up @@ -510,7 +465,7 @@ dashboards:
"h": 8,
"w": 12,
"x": 12,
"y": 11
"y": 10
},
"id": 5,
"options": {
Expand Down Expand Up @@ -602,7 +557,7 @@ dashboards:
"h": 8,
"w": 12,
"x": 0,
"y": 19
"y": 18
},
"id": 10,
"options": {
Expand Down Expand Up @@ -694,7 +649,7 @@ dashboards:
"h": 8,
"w": 12,
"x": 12,
"y": 19
"y": 18
},
"id": 11,
"options": {
Expand Down Expand Up @@ -726,16 +681,30 @@ dashboards:
"type": "timeseries"
}
],
"refresh": false,
"schemaVersion": 37,
"refresh": "",
"revision": 1,
"schemaVersion": 38,
"style": "dark",
"tags": [],
"templating": {
"list": []
"list": [
{
"datasource": {
"type": "prometheus",
"uid": "prometheus"
},
"filters": [],
"hide": 0,
"label": "",
"name": "filter",
"skipUrlSync": false,
"type": "adhoc"
}
]
},
"time": {
"from": "2023-03-30T12:36:47.587Z",
"to": "2023-03-30T12:43:11.246Z"
"from": "now-15m",
"to": "now"
},
"timepicker": {},
"timezone": "",
Expand Down
Loading

0 comments on commit 86fbb2c

Please sign in to comment.