Skip to content

Commit 045ae01

Browse files
authored
update dashboard to use rate (#99)
Signed-off-by: Mark Nelson <mark.x.nelson@oracle.com>
1 parent e7c8c3c commit 045ae01

File tree

2 files changed

+83
-73
lines changed

2 files changed

+83
-73
lines changed

docker-compose/compose.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,9 @@ services:
4848
ports:
4949
- 9161:9161
5050
environment:
51-
- DB_USERNAME=sys
51+
- DB_USERNAME=system
5252
- DB_PASSWORD=Welcome12345
5353
- DB_CONNECT_STRING=free23c:1521/free
54-
- DB_ROLE=SYSDBA
5554
- CUSTOM_METRICS=/exporter/txeventq-metrics.toml
5655
volumes:
5756
- ./exporter:/exporter

docker-compose/grafana/dashboards/oracle_rev2.json

+82-71
Original file line numberDiff line numberDiff line change
@@ -863,43 +863,42 @@
863863
"datasource": {
864864
"type": "prometheus"
865865
},
866-
"description": "",
867866
"fieldConfig": {
868867
"defaults": {
869-
"color": {
870-
"mode": "palette-classic"
871-
},
872868
"custom": {
873-
"axisCenteredZero": false,
874-
"axisColorMode": "text",
875-
"axisLabel": "",
876-
"axisPlacement": "auto",
877-
"barAlignment": 0,
878869
"drawStyle": "line",
870+
"lineInterpolation": "linear",
871+
"barAlignment": 0,
872+
"lineWidth": 1,
879873
"fillOpacity": 72,
880874
"gradientMode": "none",
881-
"hideFrom": {
882-
"legend": false,
883-
"tooltip": false,
884-
"viz": false
885-
},
875+
"spanNulls": true,
886876
"insertNulls": false,
887-
"lineInterpolation": "linear",
888-
"lineWidth": 1,
877+
"showPoints": "auto",
889878
"pointSize": 5,
879+
"stacking": {
880+
"mode": "normal",
881+
"group": "A"
882+
},
883+
"axisPlacement": "auto",
884+
"axisLabel": "",
885+
"axisColorMode": "text",
890886
"scaleDistribution": {
891887
"type": "linear"
892888
},
893-
"showPoints": "auto",
894-
"spanNulls": true,
895-
"stacking": {
896-
"group": "A",
897-
"mode": "normal"
889+
"axisCenteredZero": false,
890+
"hideFrom": {
891+
"tooltip": false,
892+
"viz": false,
893+
"legend": false
898894
},
899895
"thresholdsStyle": {
900896
"mode": "off"
901897
}
902898
},
899+
"color": {
900+
"mode": "palette-classic"
901+
},
903902
"mappings": [],
904903
"thresholds": {
905904
"mode": "absolute",
@@ -926,15 +925,15 @@
926925
},
927926
"id": 21,
928927
"options": {
929-
"legend": {
930-
"calcs": [],
931-
"displayMode": "list",
932-
"placement": "bottom",
933-
"showLegend": true
934-
},
935928
"tooltip": {
936929
"mode": "single",
937930
"sort": "none"
931+
},
932+
"legend": {
933+
"showLegend": true,
934+
"displayMode": "list",
935+
"placement": "bottom",
936+
"calcs": []
938937
}
939938
},
940939
"targets": [
@@ -944,176 +943,187 @@
944943
},
945944
"disableTextWrap": false,
946945
"editorMode": "code",
947-
"expr": "oracledb_wait_time_administrative",
946+
"expr": "rate(oracledb_wait_time_administrative[$__rate_interval])",
948947
"format": "time_series",
949948
"fullMetaSearch": false,
950949
"includeNullMetadata": true,
951950
"instant": false,
952-
"legendFormat": "{{__name__}}",
951+
"legendFormat": "Administrative",
953952
"range": true,
954953
"refId": "A",
955-
"useBackend": false
954+
"useBackend": false,
955+
"exemplar": false
956956
},
957957
{
958958
"datasource": {
959959
"type": "prometheus"
960960
},
961961
"disableTextWrap": false,
962962
"editorMode": "builder",
963-
"expr": "oracledb_wait_time_application",
963+
"expr": "rate(oracledb_wait_time_application[$__rate_interval])",
964964
"fullMetaSearch": false,
965965
"hide": false,
966-
"includeNullMetadata": true,
966+
"includeNullMetadata": false,
967967
"instant": false,
968-
"legendFormat": "{{__name__}}",
968+
"legendFormat": "Application",
969969
"range": true,
970970
"refId": "B",
971-
"useBackend": false
971+
"useBackend": false,
972+
"exemplar": false
972973
},
973974
{
974975
"datasource": {
975976
"type": "prometheus"
976977
},
977978
"disableTextWrap": false,
978979
"editorMode": "builder",
979-
"expr": "oracledb_wait_time_cluster",
980+
"expr": "rate(oracledb_wait_time_cluster[$__rate_interval])",
980981
"fullMetaSearch": false,
981982
"hide": false,
982-
"includeNullMetadata": true,
983+
"includeNullMetadata": false,
983984
"instant": false,
984-
"legendFormat": "{{__name__}}",
985+
"legendFormat": "Cluster",
985986
"range": true,
986987
"refId": "C",
987-
"useBackend": false
988+
"useBackend": false,
989+
"exemplar": false
988990
},
989991
{
990992
"datasource": {
991993
"type": "prometheus"
992994
},
993995
"disableTextWrap": false,
994996
"editorMode": "builder",
995-
"expr": "oracledb_wait_time_commit",
997+
"expr": "rate(oracledb_wait_time_commit[$__rate_interval])",
996998
"fullMetaSearch": false,
997999
"hide": false,
998-
"includeNullMetadata": true,
1000+
"includeNullMetadata": false,
9991001
"instant": false,
1000-
"legendFormat": "{{__name__}}",
1002+
"legendFormat": "Commit",
10011003
"range": true,
10021004
"refId": "D",
1003-
"useBackend": false
1005+
"useBackend": false,
1006+
"exemplar": false
10041007
},
10051008
{
10061009
"datasource": {
10071010
"type": "prometheus"
10081011
},
10091012
"disableTextWrap": false,
10101013
"editorMode": "builder",
1011-
"expr": "oracledb_wait_time_concurrency",
1014+
"expr": "rate(oracledb_wait_time_concurrency[$__rate_interval])",
10121015
"fullMetaSearch": false,
10131016
"hide": false,
1014-
"includeNullMetadata": true,
1017+
"includeNullMetadata": false,
10151018
"instant": false,
1016-
"legendFormat": "{{__name__}}",
1019+
"legendFormat": "Concurrency",
10171020
"range": true,
10181021
"refId": "E",
1019-
"useBackend": false
1022+
"useBackend": false,
1023+
"exemplar": false
10201024
},
10211025
{
10221026
"datasource": {
10231027
"type": "prometheus"
10241028
},
10251029
"disableTextWrap": false,
10261030
"editorMode": "builder",
1027-
"expr": "oracledb_wait_time_configuration",
1031+
"expr": "rate(oracledb_wait_time_configuration[$__rate_interval])",
10281032
"fullMetaSearch": false,
10291033
"hide": false,
1030-
"includeNullMetadata": true,
1034+
"includeNullMetadata": false,
10311035
"instant": false,
1032-
"legendFormat": "{{__name__}}",
1036+
"legendFormat": "Configuration",
10331037
"range": true,
10341038
"refId": "F",
1035-
"useBackend": false
1039+
"useBackend": false,
1040+
"exemplar": false
10361041
},
10371042
{
10381043
"datasource": {
10391044
"type": "prometheus"
10401045
},
10411046
"disableTextWrap": false,
10421047
"editorMode": "builder",
1043-
"expr": "oracledb_wait_time_network",
1048+
"expr": "rate(oracledb_wait_time_network[$__rate_interval])",
10441049
"fullMetaSearch": false,
10451050
"hide": false,
1046-
"includeNullMetadata": true,
1051+
"includeNullMetadata": false,
10471052
"instant": false,
1048-
"legendFormat": "{{__name__}}",
1053+
"legendFormat": "Network",
10491054
"range": true,
10501055
"refId": "G",
1051-
"useBackend": false
1056+
"useBackend": false,
1057+
"exemplar": false
10521058
},
10531059
{
10541060
"datasource": {
10551061
"type": "prometheus"
10561062
},
10571063
"disableTextWrap": false,
10581064
"editorMode": "builder",
1059-
"expr": "oracledb_wait_time_other",
1065+
"expr": "rate(oracledb_wait_time_other[$__rate_interval])",
10601066
"fullMetaSearch": false,
10611067
"hide": false,
1062-
"includeNullMetadata": true,
1068+
"includeNullMetadata": false,
10631069
"instant": false,
1064-
"legendFormat": "{{__name__}}",
1070+
"legendFormat": "Other",
10651071
"range": true,
10661072
"refId": "H",
1067-
"useBackend": false
1073+
"useBackend": false,
1074+
"exemplar": false
10681075
},
10691076
{
10701077
"datasource": {
10711078
"type": "prometheus"
10721079
},
10731080
"disableTextWrap": false,
10741081
"editorMode": "builder",
1075-
"expr": "oracledb_wait_time_scheduler",
1082+
"expr": "rate(oracledb_wait_time_scheduler[$__rate_interval])",
10761083
"fullMetaSearch": false,
10771084
"hide": false,
1078-
"includeNullMetadata": true,
1085+
"includeNullMetadata": false,
10791086
"instant": false,
1080-
"legendFormat": "{{__name__}}",
1087+
"legendFormat": "Scheduler",
10811088
"range": true,
10821089
"refId": "I",
1083-
"useBackend": false
1090+
"useBackend": false,
1091+
"exemplar": false
10841092
},
10851093
{
10861094
"datasource": {
10871095
"type": "prometheus"
10881096
},
10891097
"disableTextWrap": false,
10901098
"editorMode": "builder",
1091-
"expr": "oracledb_wait_time_user_io",
1099+
"expr": "rate(oracledb_wait_time_user_io[$__rate_interval])",
10921100
"fullMetaSearch": false,
10931101
"hide": false,
1094-
"includeNullMetadata": true,
1102+
"includeNullMetadata": false,
10951103
"instant": false,
1096-
"legendFormat": "{{__name__}}",
1104+
"legendFormat": "User I/O",
10971105
"range": true,
10981106
"refId": "J",
1099-
"useBackend": false
1107+
"useBackend": false,
1108+
"exemplar": false
11001109
},
11011110
{
11021111
"datasource": {
11031112
"type": "prometheus"
11041113
},
11051114
"disableTextWrap": false,
11061115
"editorMode": "builder",
1107-
"expr": "oracledb_wait_time_system_io",
1116+
"expr": "rate(oracledb_wait_time_system_io[$__rate_interval])",
11081117
"format": "time_series",
11091118
"fullMetaSearch": false,
11101119
"hide": false,
1111-
"includeNullMetadata": true,
1120+
"includeNullMetadata": false,
11121121
"instant": false,
1113-
"legendFormat": "{{__name__}}",
1122+
"legendFormat": "System I/O",
11141123
"range": true,
11151124
"refId": "K",
1116-
"useBackend": false
1125+
"useBackend": false,
1126+
"exemplar": false
11171127
}
11181128
],
11191129
"title": "Database Wait Times",
@@ -1126,7 +1136,8 @@
11261136
}
11271137
}
11281138
],
1129-
"type": "timeseries"
1139+
"type": "timeseries",
1140+
"description": ""
11301141
},
11311142
{
11321143
"collapsed": false,

0 commit comments

Comments
 (0)