Skip to content

Commit ddd178a

Browse files
committed
Updated links and signals to use Sentence case. Update signals to use counter type and range increase.
1 parent 626ff57 commit ddd178a

File tree

10 files changed

+58
-54
lines changed

10 files changed

+58
-54
lines changed

wildfly-mixin/dashboards.libsonnet

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ local logslib = import 'logs-lib/logs/main.libsonnet';
1717
{
1818

1919
'wildfly-overview.json':
20-
g.dashboard.new(this.config.dashboardNamePrefix + ' Overview')
20+
g.dashboard.new(this.config.dashboardNamePrefix + ' overview')
2121
+ g.dashboard.withPanels(
2222
g.util.panel.resolveCollapsedFlagOnRows(
2323
g.util.grid.wrapPanels([
@@ -46,7 +46,7 @@ local logslib = import 'logs-lib/logs/main.libsonnet';
4646
period,
4747
),
4848
'wildfly-datasource.json':
49-
g.dashboard.new(this.config.dashboardNamePrefix + ' Datasource')
49+
g.dashboard.new(this.config.dashboardNamePrefix + ' datasource')
5050
+ g.dashboard.withPanels(
5151
g.util.panel.resolveCollapsedFlagOnRows(
5252
g.util.grid.wrapPanels([
@@ -73,7 +73,7 @@ local logslib = import 'logs-lib/logs/main.libsonnet';
7373
} + if this.config.enableLokiLogs then {
7474
'wildfly-logs.json':
7575
logslib.new(
76-
this.config.dashboardNamePrefix + ' Logs',
76+
this.config.dashboardNamePrefix + ' logs',
7777
datasourceName=this.grafana.variables.datasources.loki.name,
7878
datasourceRegex=this.grafana.variables.datasources.loki.regex,
7979
filterSelector=this.config.filteringSelector,

wildfly-mixin/dashboards_out/wildfly-datasource.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wildfly-mixin/dashboards_out/wildfly-logs.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wildfly-mixin/dashboards_out/wildfly-overview.json

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wildfly-mixin/links.libsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ local g = import './g.libsonnet';
55
new(this):
66
{
77
wildflyOverview:
8-
link.link.new('Wildfly Overview', '/d/' + this.grafana.dashboards['wildfly-overview.json'].uid)
8+
link.link.new('Wildfly overview', '/d/' + this.grafana.dashboards['wildfly-overview.json'].uid)
99
+ link.link.options.withKeepTime(true),
1010

1111
wildflyDatasource:
12-
link.link.new('Wildfly Datasource', '/d/' + this.grafana.dashboards['wildfly-datasource.json'].uid)
12+
link.link.new('Wildfly datasource', '/d/' + this.grafana.dashboards['wildfly-datasource.json'].uid)
1313
+ link.link.options.withKeepTime(true),
1414

1515
otherDashboards:

wildfly-mixin/signals/connections.libsonnet

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ function(this)
1313
},
1414
signals: {
1515
connectionsActive: {
16-
name: 'Active Connections',
17-
nameShort: 'Active Connections',
16+
name: 'Active connections',
17+
nameShort: 'Active connections',
1818
type: 'gauge',
1919
description: 'Connections to the datasource over time',
2020
sources: {
@@ -25,8 +25,8 @@ function(this)
2525
},
2626
},
2727
connectionsIdle: {
28-
name: 'Idle Connections',
29-
nameShort: 'Idle Connections',
28+
name: 'Idle connections',
29+
nameShort: 'Idle connections',
3030
type: 'gauge',
3131
description: 'Idle connections to the datasource over time',
3232
sources: {

wildfly-mixin/signals/network.libsonnet

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ function(this)
1313
},
1414
signals: {
1515
networkReceivedThroughput: {
16-
name: 'Network Received Throughput',
17-
nameShort: 'Network Received',
16+
name: 'Network received throughput',
17+
nameShort: 'Network received',
1818
type: 'counter',
1919
description: 'Throughput rate of data received over time',
2020
unit: 'binBps',
@@ -26,8 +26,8 @@ function(this)
2626
},
2727
},
2828
networkSentThroughput: {
29-
name: 'Network Sent Throughput',
30-
nameShort: 'Network Sent',
29+
name: 'Network sent throughput',
30+
nameShort: 'Network sent',
3131
type: 'counter',
3232
description: 'Throughput rate of data sent over time',
3333
unit: 'binBps',

wildfly-mixin/signals/requests.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ function(this)
1313
},
1414
signals: {
1515
requestsRate: {
16-
name: 'Requests Rate',
16+
name: 'Requests rate',
1717
nameShort: 'Requests',
1818
type: 'counter',
1919
description: 'Requests rate over time',

wildfly-mixin/signals/sessions.libsonnet

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ function(this)
1313
},
1414
signals: {
1515
activeSessions: {
16-
name: 'Active Sessions',
17-
nameShort: 'Active Sessions',
16+
name: 'Active sessions',
17+
nameShort: 'Active sessions',
1818
type: 'gauge',
1919
description: 'Number of active sessions to deployment over time',
2020
sources: {
@@ -25,25 +25,27 @@ function(this)
2525
},
2626
},
2727
expiredSessions: {
28-
name: 'Expired Sessions',
29-
nameShort: 'Expired Sessions',
30-
type: 'raw',
28+
name: 'Expired sessions',
29+
nameShort: 'Expired sessions',
30+
type: 'counter',
3131
description: 'Number of sessions that have expired for a deployment over time',
3232
sources: {
3333
prometheus: {
34-
expr: 'increase(wildfly_undertow_expired_sessions_total{%(queriesSelector)s,deployment=~"$deployment"}[$__interval])',
34+
expr: 'wildfly_undertow_expired_sessions_total{%(queriesSelector)s,deployment=~"$deployment"}',
35+
rangeFunction: 'increase',
3536
legendCustomTemplate: '{{deployment}}',
3637
},
3738
},
3839
},
3940
rejectedSessions: {
40-
name: 'Rejected Sessions',
41-
nameShort: 'Rejected Sessions',
42-
type: 'raw',
41+
name: 'Rejected sessions',
42+
nameShort: 'Rejected sessions',
43+
type: 'counter',
4344
description: 'Number of sessions that have been rejected from a deployment over time',
4445
sources: {
4546
prometheus: {
46-
expr: 'increase(wildfly_undertow_rejected_sessions_total{%(queriesSelector)s,deployment=~"$deployment"}[$__interval])',
47+
expr: 'wildfly_undertow_rejected_sessions_total{%(queriesSelector)s,deployment=~"$deployment"}',
48+
rangeFunction: 'increase',
4749
legendCustomTemplate: '{{deployment}}',
4850
},
4951
},

wildfly-mixin/signals/transactions.libsonnet

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,21 @@ function(this)
1313
},
1414
signals: {
1515
transactionsCreated: {
16-
name: 'Created Transactions',
17-
nameShort: 'Created Transactions',
18-
type: 'raw',
16+
name: 'Created transactions',
17+
nameShort: 'Created transactions',
18+
type: 'counter',
1919
description: 'Number of transactions that were created over time',
2020
sources: {
2121
prometheus: {
22-
expr: 'increase(wildfly_transactions_number_of_transactions_total{%(queriesSelector)s}[$__interval])',
22+
expr: 'wildfly_transactions_number_of_transactions_total{%(queriesSelector)s}',
23+
rangeFunction: 'increase',
2324
legendCustomTemplate: '{{instance}}',
2425
},
2526
},
2627
},
2728
transactionsInFlight: {
28-
name: 'In-flight Transactions',
29-
nameShort: 'In-flight Transactions',
29+
name: 'In-flight transactions',
30+
nameShort: 'In-flight transactions',
3031
type: 'gauge',
3132
description: 'Number of transactions that are in-flight over time',
3233
sources: {
@@ -37,13 +38,14 @@ function(this)
3738
},
3839
},
3940
transactionsAborted: {
40-
name: 'Aborted Transactions',
41-
nameShort: 'Aborted Transactions',
42-
type: 'raw',
41+
name: 'Aborted transactions',
42+
nameShort: 'Aborted transactions',
43+
type: 'counter',
4344
description: 'Number of transactions that have been aborted over time',
4445
sources: {
4546
prometheus: {
46-
expr: 'increase(wildfly_transactions_number_of_aborted_transactions_total{%(queriesSelector)s}[$__interval])',
47+
expr: 'wildfly_transactions_number_of_aborted_transactions_total{%(queriesSelector)s}',
48+
rangeFunction: 'increase',
4749
legendCustomTemplate: '{{instance}}',
4850
},
4951
},

0 commit comments

Comments
 (0)