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

More development dashboards #16550

Merged
merged 2 commits into from Apr 15, 2019
Merged

More development dashboards #16550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9843e3f
Dev: more dev dashboards and structure
torkelo Apr 11, 2019
d7f46ab
Moving gdev dashboards around into folders and aligning tags
torkelo Apr 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion devenv/dashboards.yaml
View file
Open in desktop
Expand Up @@ -4,6 +4,6 @@ providers:
- name: 'gdev dashboards'
folder: 'gdev dashboards'
type: file
updateIntervalSeconds: 15
updateIntervalSeconds: 60
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wont this just be frustrating when working with dashboards?
I think all devs runs SSD nowdays and the content should almost always be cached. scanning a few files are very very very fast :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea I increased it a bit after testing with many folders defined here (each have it's own interval) and the log spamming was a bit too much. And if we end up with a lot of dashboards parsing all those json files is going to eat up a lot cpu. The way the scanning works provisioning update cycles are far from cheap, having to deserialize all dashboards, and to hashed checksum on content, at least.

Set to 3s with 1300 dashboards it eats 100% according to this user: #16118

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But that 100% could be due to something else, maybe huge > megabytes big json dashboards (can happen)

options:
path: devenv/dev-dashboards
81 changes: 14 additions & 67 deletions devenv/dev-dashboards/testdata_alerts.json → ...-dashboards/alerting/testdata_alerts.json
View file
Open in desktop
Expand Up @@ -22,17 +22,11 @@
"conditions": [
{
"evaluator": {
"params": [
60
],
"params": [60],
"type": "gt"
},
"query": {
"params": [
"A",
"5m",
"now"
]
"params": ["A", "5m", "now"]
},
"reducer": {
"params": [],
Expand Down Expand Up @@ -149,17 +143,11 @@
"conditions": [
{
"evaluator": {
"params": [
177
],
"params": [177],
"type": "gt"
},
"query": {
"params": [
"A",
"5m",
"now"
]
"params": ["A", "5m", "now"]
},
"reducer": {
"params": [],
Expand Down Expand Up @@ -278,20 +266,14 @@
"conditions": [
{
"evaluator": {
"params": [
1
],
"params": [1],
"type": "gt"
},
"operator": {
"type": "and"
},
"query": {
"params": [
"A",
"15m",
"now"
]
"params": ["A", "15m", "now"]
},
"reducer": {
"params": [],
Expand Down Expand Up @@ -409,20 +391,14 @@
"conditions": [
{
"evaluator": {
"params": [
177
],
"params": [177],
"type": "gt"
},
"operator": {
"type": "and"
},
"query": {
"params": [
"A",
"15m",
"now"
]
"params": ["A", "15m", "now"]
},
"reducer": {
"params": [],
Expand Down Expand Up @@ -540,20 +516,14 @@
"conditions": [
{
"evaluator": {
"params": [
100
],
"params": [100],
"type": "gt"
},
"operator": {
"type": "and"
},
"query": {
"params": [
"A",
"5m",
"now"
]
"params": ["A", "5m", "now"]
},
"reducer": {
"params": [],
Expand Down Expand Up @@ -670,9 +640,7 @@
"revision": 2,
"schemaVersion": 16,
"style": "dark",
"tags": [
"grafana-test"
],
"tags": ["gdev", "alerting"],
"templating": {
"list": []
},
Expand All @@ -681,32 +649,11 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "browser",
"title": "Alerting with TestData",
"uid": "7MeksYbmk",
"version": 7
}
}
53 changes: 7 additions & 46 deletions ...tasource_tests_elasticsearch_compare.json → ...-elasticsearch/elasticsearch_compare.json
View file
Open in desktop
Expand Up @@ -21,10 +21,7 @@
"links": [
{
"icon": "external link",
"tags": [
"gdev",
"elasticsearch"
],
"tags": ["gdev", "elasticsearch", "datasource-test"],
"type": "dashboards"
}
],
Expand Down Expand Up @@ -1824,13 +1821,7 @@
"id": "1",
"meta": {},
"settings": {
"percents": [
25,
50,
75,
95,
99
]
"percents": [25, 50, 75, 95, 99]
},
"type": "percentiles"
}
Expand Down Expand Up @@ -1941,13 +1932,7 @@
"meta": {},
"settings": {
"missing": null,
"percents": [
25,
50,
75,
95,
99
]
"percents": [25, 50, 75, 95, 99]
},
"type": "percentiles"
}
Expand Down Expand Up @@ -5858,10 +5843,7 @@
"refresh": false,
"schemaVersion": 16,
"style": "dark",
"tags": [
"gdev",
"elasticsearch"
],
"tags": ["gdev", "elasticsearch"],
"templating": {
"list": [
{
Expand Down Expand Up @@ -5901,32 +5883,11 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "",
"title": "Datasource tests - Elasticsearch comparison",
"uid": "fuFWehBmk",
"version": 4
}
}
2 changes: 1 addition & 1 deletion ...ds/datasource_tests_elasticsearch_v2.json → ...ource-elasticsearch/elasticsearch_v2.json
View file
Open in desktop
Expand Up @@ -645,7 +645,7 @@
],
"schemaVersion": 18,
"style": "dark",
"tags": ["elasticsearch", "gdev"],
"tags": ["elasticsearch", "gdev", "datasource-test"],
"templating": {
"list": [
{
Expand Down
2 changes: 1 addition & 1 deletion ...ds/datasource_tests_elasticsearch_v5.json → ...ource-elasticsearch/elasticsearch_v5.json
View file
Open in desktop
Expand Up @@ -648,7 +648,7 @@
],
"schemaVersion": 18,
"style": "dark",
"tags": ["elasticsearch", "gdev"],
"tags": ["elasticsearch", "gdev", "datasource-test"],
"templating": {
"list": [
{
Expand Down
2 changes: 1 addition & 1 deletion ...ds/datasource_tests_elasticsearch_v6.json → ...ource-elasticsearch/elasticsearch_v6.json
View file
Open in desktop
Expand Up @@ -645,7 +645,7 @@
],
"schemaVersion": 18,
"style": "dark",
"tags": ["elasticsearch", "gdev"],
"tags": ["elasticsearch", "gdev", "datasource-test"],
"templating": {
"list": [
{
Expand Down
2 changes: 1 addition & 1 deletion ...urce_tests_elasticsearch_v6_filebeat.json → ...sticsearch/elasticsearch_v6_filebeat.json
View file
Open in desktop
Expand Up @@ -226,7 +226,7 @@
],
"schemaVersion": 18,
"style": "dark",
"tags": ["gdev", "elasticsearch"],
"tags": ["gdev", "elasticsearch", "datasource-test"],
"templating": {
"list": [
{
Expand Down
35 changes: 5 additions & 30 deletions ...ards/datasource_tests_mssql_fakedata.json → ...ards/datasource-mssql/mssql_fakedata.json
View file
Open in desktop
Expand Up @@ -319,11 +319,7 @@
{
"alias": "",
"colorMode": null,
"colors": [
"rgba(245, 54, 54, 0.9)",
"rgba(237, 129, 40, 0.89)",
"rgba(50, 172, 45, 0.97)"
],
"colors": ["rgba(245, 54, 54, 0.9)", "rgba(237, 129, 40, 0.89)", "rgba(50, 172, 45, 0.97)"],
"decimals": 2,
"pattern": "/.*/",
"thresholds": [],
Expand All @@ -346,7 +342,7 @@
],
"schemaVersion": 16,
"style": "dark",
"tags": ["gdev", "mssql", "fake-data-gen"],
"tags": ["gdev", "mssql", "datasource-test"],
"templating": {
"list": [
{
Expand Down Expand Up @@ -486,32 +482,11 @@
"to": "now"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
"refresh_intervals": ["5s", "10s", "30s", "1m", "5m", "15m", "30m", "1h", "2h", "1d"],
"time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
},
"timezone": "",
"title": "Datasource tests - MSSQL",
"uid": "86Js1xRmk",
"version": 1
}
}