Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Update ci/build #9

Merged
merged 3 commits into from
Feb 15, 2024
Merged

chore: Update ci/build #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
435060a
chore: Update ci/build
adinhodovic Feb 15, 2024
912ab00
fix: remove excess file
adinhodovic Feb 15, 2024
f1612a8
chore: Bump deps
adinhodovic Feb 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 12 additions & 14 deletions config.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
local grafana = import 'github.com/grafana/grafonnet-lib/grafonnet/grafana.libsonnet';
local annotation = grafana.annotation;
local g = import 'github.com/grafana/grafonnet/gen/grafonnet-latest/main.libsonnet';
local annotation = g.dashboard.annotation;

{
_config+:: {
Expand Down Expand Up @@ -36,22 +36,20 @@ local annotation = grafana.annotation;
// Custom annotations to display in graphs
annotation: {
enabled: false,
name: 'Deploys',
name: 'Custom Annotation',
datasource: '-- Grafana --',
iconColor: 'green',
tags: [],
},

customAnnotation:: if $._config.annotation.enabled then
annotation.datasource(
$._config.annotation.name,
datasource=$._config.annotation.datasource,
hide=false,
) + {
target: {
matchAny: true,
tags: $._config.annotation.tags,
type: 'tags',
},
} else {},
annotation.withName($._config.annotation.name) +
annotation.withIconColor($._config.annotation.iconColor) +
annotation.withHide(false) +
annotation.datasource.withUid($._config.annotation.datasource) +
annotation.target.withMatchAny(true) +
annotation.target.withTags($._config.annotation.tags) +
annotation.target.withType('tags')
else {},
},
}
1 change: 0 additions & 1 deletion dashboards/django-requests-overview.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ local tbOverride = tbStandardOptions.override;
query.refresh.onLoad() +
query.refresh.onTime(),


local jobVariable =
query.new(
'job',
Expand Down
23 changes: 13 additions & 10 deletions dashboards_out/django-overview.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
],
"panels": [
{
"collapsed": false,
"gridPos": {
"h": 1,
"w": 24,
Expand Down Expand Up @@ -62,7 +63,7 @@
]
}
},
"pluginVersion": "v10.1.0",
"pluginVersion": "v10.2.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -111,7 +112,7 @@
]
}
},
"pluginVersion": "v10.1.0",
"pluginVersion": "v10.2.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -160,7 +161,7 @@
]
}
},
"pluginVersion": "v10.1.0",
"pluginVersion": "v10.2.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -277,7 +278,7 @@
"sort": "desc"
}
},
"pluginVersion": "v10.1.0",
"pluginVersion": "v10.2.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -316,6 +317,7 @@
"type": "timeseries"
},
{
"collapsed": false,
"gridPos": {
"h": 1,
"w": 24,
Expand Down Expand Up @@ -358,7 +360,7 @@
]
}
},
"pluginVersion": "v10.1.0",
"pluginVersion": "v10.2.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -407,7 +409,7 @@
]
}
},
"pluginVersion": "v10.1.0",
"pluginVersion": "v10.2.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -444,7 +446,7 @@
}
]
},
"pluginVersion": "v10.1.0",
"pluginVersion": "v10.2.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -518,7 +520,7 @@
"sort": "desc"
}
},
"pluginVersion": "v10.1.0",
"pluginVersion": "v10.2.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -571,7 +573,7 @@
"sort": "desc"
}
},
"pluginVersion": "v10.1.0",
"pluginVersion": "v10.2.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -610,6 +612,7 @@
"type": "timeseries"
},
{
"collapsed": false,
"gridPos": {
"h": 1,
"w": 24,
Expand Down Expand Up @@ -662,7 +665,7 @@
"sort": "desc"
}
},
"pluginVersion": "v10.1.0",
"pluginVersion": "v10.2.0",
"targets": [
{
"datasource": {
Expand Down
19 changes: 11 additions & 8 deletions dashboards_out/django-requests-by-view.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
],
"panels": [
{
"collapsed": false,
"gridPos": {
"h": 1,
"w": 24,
Expand Down Expand Up @@ -66,7 +67,7 @@
]
}
},
"pluginVersion": "v10.1.0",
"pluginVersion": "v10.2.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -119,7 +120,7 @@
]
}
},
"pluginVersion": "v10.1.0",
"pluginVersion": "v10.2.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -172,7 +173,7 @@
]
}
},
"pluginVersion": "v10.1.0",
"pluginVersion": "v10.2.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -225,7 +226,7 @@
]
}
},
"pluginVersion": "v10.1.0",
"pluginVersion": "v10.2.0",
"targets": [
{
"datasource": {
Expand All @@ -239,6 +240,7 @@
"type": "stat"
},
{
"collapsed": false,
"gridPos": {
"h": 1,
"w": 24,
Expand Down Expand Up @@ -288,7 +290,7 @@
"sort": "desc"
}
},
"pluginVersion": "v10.1.0",
"pluginVersion": "v10.2.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -406,7 +408,7 @@
"sort": "desc"
}
},
"pluginVersion": "v10.1.0",
"pluginVersion": "v10.2.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -445,6 +447,7 @@
"type": "timeseries"
},
{
"collapsed": false,
"gridPos": {
"h": 1,
"w": 24,
Expand Down Expand Up @@ -497,7 +500,7 @@
"sort": "desc"
}
},
"pluginVersion": "v10.1.0",
"pluginVersion": "v10.2.0",
"targets": [
{
"datasource": {
Expand Down Expand Up @@ -550,7 +553,7 @@
"sort": "desc"
}
},
"pluginVersion": "v10.1.0",
"pluginVersion": "v10.2.0",
"targets": [
{
"datasource": {
Expand Down
Loading
Loading