Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
controller
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TFS
controller
Commits
14042fec
Commit
14042fec
authored
2 years ago
by
Lluis Gifre Renom
Browse files
Options
Downloads
Patches
Plain Diff
WebUI - Grafana:
- Updated device details dashboard
parent
35596ca1
No related branches found
No related tags found
2 merge requests
!142
Release TeraFlowSDN 2.1
,
!99
Device and WebUI components - Improve AddDevice performance metrics
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
deploy/tfs.sh
+3
-3
3 additions, 3 deletions
deploy/tfs.sh
src/webui/grafana_prom_device_exec_details.json
+72
-27
72 additions, 27 deletions
src/webui/grafana_prom_device_exec_details.json
with
75 additions
and
30 deletions
deploy/tfs.sh
+
3
−
3
View file @
14042fec
...
@@ -486,11 +486,11 @@ if [[ "$TFS_COMPONENTS" == *"webui"* ]]; then
...
@@ -486,11 +486,11 @@ if [[ "$TFS_COMPONENTS" == *"webui"* ]]; then
curl
-X
POST
${
GRAFANA_URL_UPDATED
}
/api/user/stars/dashboard/
${
DASHBOARD_ID
}
curl
-X
POST
${
GRAFANA_URL_UPDATED
}
/api/user/stars/dashboard/
${
DASHBOARD_ID
}
echo
echo
# Dashboard: Device
ConfigureDevice
Details
# Dashboard: Device
Execution
Details
curl
-X
POST
-H
"Content-Type: application/json"
-d
'@src/webui/grafana_prom_device_
config_
exec_details.json'
\
curl
-X
POST
-H
"Content-Type: application/json"
-d
'@src/webui/grafana_prom_device_exec_details.json'
\
${
GRAFANA_URL_UPDATED
}
/api/dashboards/db
${
GRAFANA_URL_UPDATED
}
/api/dashboards/db
echo
echo
DASHBOARD_URL
=
"
${
GRAFANA_URL_UPDATED
}
/api/dashboards/uid/tfs-dev-
confdev
"
DASHBOARD_URL
=
"
${
GRAFANA_URL_UPDATED
}
/api/dashboards/uid/tfs-dev-
exec
"
DASHBOARD_ID
=
$(
curl
-s
"
${
DASHBOARD_URL
}
"
| jq
'.dashboard.id'
)
DASHBOARD_ID
=
$(
curl
-s
"
${
DASHBOARD_URL
}
"
| jq
'.dashboard.id'
)
curl
-X
POST
${
GRAFANA_URL_UPDATED
}
/api/user/stars/dashboard/
${
DASHBOARD_ID
}
curl
-X
POST
${
GRAFANA_URL_UPDATED
}
/api/user/stars/dashboard/
${
DASHBOARD_ID
}
echo
echo
...
...
This diff is collapsed.
Click to expand it.
src/webui/grafana_prom_device_exec_details.json
+
72
−
27
View file @
14042fec
...
@@ -25,8 +25,8 @@
...
@@ -25,8 +25,8 @@
"editable"
:
true
,
"editable"
:
true
,
"fiscalYearStartMonth"
:
0
,
"fiscalYearStartMonth"
:
0
,
"graphTooltip"
:
0
,
"graphTooltip"
:
0
,
"id"
:
6
,
"id"
:
null
,
"iteration"
:
168
269794178
5
,
"iteration"
:
168
303645243
5
,
"links"
:
[],
"links"
:
[],
"liveNow"
:
false
,
"liveNow"
:
false
,
"panels"
:
[
"panels"
:
[
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
"dataFormat"
:
"tsbuckets"
,
"dataFormat"
:
"tsbuckets"
,
"datasource"
:
{
"datasource"
:
{
"type"
:
"prometheus"
,
"type"
:
"prometheus"
,
"uid"
:
"
b1BgiIsVz
"
"uid"
:
"
prometheus
"
},
},
"gridPos"
:
{
"gridPos"
:
{
"h"
:
22
,
"h"
:
22
,
...
@@ -65,15 +65,17 @@
...
@@ -65,15 +65,17 @@
{
{
"datasource"
:
{
"datasource"
:
{
"type"
:
"prometheus"
,
"type"
:
"prometheus"
,
"uid"
:
"
b1BgiIsVz
"
"uid"
:
"
prometheus
"
},
},
"editorMode"
:
"code"
,
"exemplar"
:
true
,
"exemplar"
:
true
,
"expr"
:
"sum(
\r\n
max_over_time(tfs_device_exec_details_
[[method]]_
histogram_duration_bucket{
pod=~
\"
[[pod
]]
\"
, step=~
\"
[[step]]
\"
}[1m]) -
\r\n
min_over_time(tfs_device_exec_details_
[[method]]_
histogram_duration_bucket{
pod=~
\"
[[pod
]]
\"
, step=~
\"
[[step]]
\"
}[1m])
\r\n
) by (le)"
,
"expr"
:
"sum(
\r\n
max_over_time(tfs_device_exec
ution
_details_histogram_duration_bucket{
driver=~
\"
[[driver]]
\"
, operation=~
\"
[[operation
]]
\"
, step=~
\"
[[step]]
\"
}[1m]) -
\r\n
min_over_time(tfs_device_exec
ution
_details_histogram_duration_bucket{
driver=~
\"
[[driver]]
\"
, operation=~
\"
[[operation
]]
\"
, step=~
\"
[[step]]
\"
}[1m])
\r\n
) by (le)"
,
"format"
:
"heatmap"
,
"format"
:
"heatmap"
,
"instant"
:
false
,
"instant"
:
false
,
"interval"
:
"1m"
,
"interval"
:
"1m"
,
"intervalFactor"
:
1
,
"intervalFactor"
:
1
,
"legendFormat"
:
"{{le}}"
,
"legendFormat"
:
"{{le}}"
,
"range"
:
true
,
"refId"
:
"A"
"refId"
:
"A"
}
}
],
],
...
@@ -94,7 +96,7 @@
...
@@ -94,7 +96,7 @@
"yBucketBound"
:
"auto"
"yBucketBound"
:
"auto"
}
}
],
],
"refresh"
:
""
,
"refresh"
:
"
5s
"
,
"schemaVersion"
:
36
,
"schemaVersion"
:
36
,
"style"
:
"dark"
,
"style"
:
"dark"
,
"tags"
:
[],
"tags"
:
[],
...
@@ -113,17 +115,52 @@
...
@@ -113,17 +115,52 @@
},
},
"datasource"
:
{
"datasource"
:
{
"type"
:
"prometheus"
,
"type"
:
"prometheus"
,
"uid"
:
"
b1BgiIsVz
"
"uid"
:
"
prometheus
"
},
},
"definition"
:
"label_values(tfs_device_execution_details_histogram_duration_bucket,
pod
)"
,
"definition"
:
"label_values(tfs_device_execution_details_histogram_duration_bucket,
operation
)"
,
"hide"
:
0
,
"hide"
:
0
,
"includeAll"
:
true
,
"includeAll"
:
true
,
"label"
:
"
Pod
"
,
"label"
:
"
Operation
"
,
"multi"
:
true
,
"multi"
:
true
,
"name"
:
"
pod
"
,
"name"
:
"
operation
"
,
"options"
:
[],
"options"
:
[],
"query"
:
{
"query"
:
{
"query"
:
"label_values(tfs_device_execution_details_histogram_duration_bucket, pod)"
,
"query"
:
"label_values(tfs_device_execution_details_histogram_duration_bucket, operation)"
,
"refId"
:
"StandardVariableQuery"
},
"refresh"
:
2
,
"regex"
:
""
,
"skipUrlSync"
:
false
,
"sort"
:
0
,
"tagValuesQuery"
:
""
,
"tagsQuery"
:
""
,
"type"
:
"query"
,
"useTags"
:
false
},
{
"allValue"
:
".*"
,
"current"
:
{
"selected"
:
true
,
"text"
:
[
"All"
],
"value"
:
[
"$__all"
]
},
"datasource"
:
{
"type"
:
"prometheus"
,
"uid"
:
"prometheus"
},
"definition"
:
"label_values(tfs_device_execution_details_histogram_duration_bucket, driver)"
,
"hide"
:
0
,
"includeAll"
:
true
,
"label"
:
"Driver"
,
"multi"
:
true
,
"name"
:
"driver"
,
"options"
:
[],
"query"
:
{
"query"
:
"label_values(tfs_device_execution_details_histogram_duration_bucket, driver)"
,
"refId"
:
"StandardVariableQuery"
"refId"
:
"StandardVariableQuery"
},
},
"refresh"
:
2
,
"refresh"
:
2
,
...
@@ -138,13 +175,17 @@
...
@@ -138,13 +175,17 @@
{
{
"allValue"
:
".*"
,
"allValue"
:
".*"
,
"current"
:
{
"current"
:
{
"selected"
:
false
,
"selected"
:
true
,
"text"
:
"All"
,
"text"
:
[
"value"
:
"$__all"
"All"
],
"value"
:
[
"$__all"
]
},
},
"datasource"
:
{
"datasource"
:
{
"type"
:
"prometheus"
,
"type"
:
"prometheus"
,
"uid"
:
"
b1BgiIsVz
"
"uid"
:
"
prometheus
"
},
},
"definition"
:
"label_values(tfs_device_execution_details_histogram_duration_bucket, step)"
,
"definition"
:
"label_values(tfs_device_execution_details_histogram_duration_bucket, step)"
,
"hide"
:
0
,
"hide"
:
0
,
...
@@ -169,23 +210,27 @@
...
@@ -169,23 +210,27 @@
{
{
"allValue"
:
".*"
,
"allValue"
:
".*"
,
"current"
:
{
"current"
:
{
"selected"
:
false
,
"selected"
:
true
,
"text"
:
"All"
,
"text"
:
[
"value"
:
"$__all"
"All"
],
"value"
:
[
"$__all"
]
},
},
"datasource"
:
{
"datasource"
:
{
"type"
:
"prometheus"
,
"type"
:
"prometheus"
,
"uid"
:
"
b1BgiIsVz
"
"uid"
:
"
prometheus
"
},
},
"definition"
:
"label_values(tfs_device_execution_details_histogram_duration_bucket,
operation
)"
,
"definition"
:
"label_values(tfs_device_execution_details_histogram_duration_bucket,
pod
)"
,
"hide"
:
0
,
"hide"
:
0
,
"includeAll"
:
true
,
"includeAll"
:
true
,
"label"
:
"
Operation
"
,
"label"
:
"
Pod
"
,
"multi"
:
true
,
"multi"
:
true
,
"name"
:
"
operation
"
,
"name"
:
"
pod
"
,
"options"
:
[],
"options"
:
[],
"query"
:
{
"query"
:
{
"query"
:
"label_values(tfs_device_execution_details_histogram_duration_bucket,
operation
)"
,
"query"
:
"label_values(tfs_device_execution_details_histogram_duration_bucket,
pod
)"
,
"refId"
:
"StandardVariableQuery"
"refId"
:
"StandardVariableQuery"
},
},
"refresh"
:
2
,
"refresh"
:
2
,
...
@@ -200,14 +245,14 @@
...
@@ -200,14 +245,14 @@
]
]
},
},
"time"
:
{
"time"
:
{
"from"
:
"now-
2d
"
,
"from"
:
"now-
15m
"
,
"to"
:
"now"
"to"
:
"now"
},
},
"timepicker"
:
{},
"timepicker"
:
{},
"timezone"
:
""
,
"timezone"
:
""
,
"title"
:
"TFS / Device Details"
,
"title"
:
"TFS / Device
Execution
Details"
,
"uid"
:
"tfs-dev-
confdev
"
,
"uid"
:
"tfs-dev-
exec
"
,
"version"
:
7
,
"version"
:
4
,
"weekStart"
:
""
"weekStart"
:
""
}
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment