-
Notifications
You must be signed in to change notification settings - Fork 160
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.
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
Commonlib table support #1290
Merged
Merged
Commonlib table support #1290
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
6784b86
Update grafonnet dependency in commonlib
v-zhuravlev f74f9d7
Add support for building tables in commonlib.
v-zhuravlev 3ec3ba2
Revert newline
v-zhuravlev be04395
Update tests
v-zhuravlev aa9b3be
Fix tests
v-zhuravlev 0d8e4a6
Add tests
v-zhuravlev 06cb992
Update stub
v-zhuravlev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| import 'github.com/grafana/grafonnet/gen/grafonnet-v10.0.0/main.libsonnet' | ||
| import 'github.com/grafana/grafonnet/gen/grafonnet-v11.0.0/main.libsonnet' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| local signal = import './signal.libsonnet'; | ||
| local test = import 'jsonnetunit/test.libsonnet'; | ||
|
|
||
| local m1 = signal.init( | ||
| filteringSelector=['job="abc"'], | ||
| interval='5m', | ||
| aggLevel='instance', | ||
| aggFunction='max', | ||
| ).addSignal( | ||
| name='API server requests', | ||
| type='counter', | ||
| unit='requests', | ||
| description='API server calls.', | ||
| expr='apiserver_request_total{%(queriesSelector)s}', | ||
| ); | ||
|
|
||
| { | ||
|
|
||
| asTableColumn: { | ||
| raw:: m1.asTableColumn(), | ||
| testResult: test.suite({ | ||
| testFormat: { | ||
| actual: m1.asTableColumn().targets[0].format, | ||
| expect: 'table', | ||
| }, | ||
| testExpression: { | ||
| actual: m1.asTableColumn().targets[0].expr, | ||
| expect: 'max by (job,instance) (\n rate(apiserver_request_total{job="abc",job=~"$job",instance=~"$instance"}[5m])\n)', | ||
| }, | ||
| testInstant: { | ||
| actual: m1.asTableColumn().targets[0].instant, | ||
| expect: true, | ||
| }, | ||
| }), | ||
| }, | ||
| asTableColumnWithTimeSeries: { | ||
| raw:: m1.asTableColumn(format='time_series'), | ||
| testResult: test.suite({ | ||
| testFormat: { | ||
| actual: m1.asTableColumn(format='time_series').targets[0].format, | ||
| expect: 'time_series', | ||
| }, | ||
| testExpression: { | ||
| actual: m1.asTableColumn(format='time_series').targets[0].expr, | ||
| expect: 'max by (job,instance) (\n rate(apiserver_request_total{job="abc",job=~"$job",instance=~"$instance"}[5m])\n)', | ||
| }, | ||
| testInstant: { | ||
| actual: m1.asTableColumn(format='time_series').targets[0].instant, | ||
| expect: false, | ||
| }, | ||
| }), | ||
| }, | ||
| asTable: | ||
| { | ||
| raw:: m1.asTable(), | ||
| testResult: test.suite({ | ||
| testTStitle: { | ||
| actual: m1.asTable().title, | ||
| expect: 'API server requests', | ||
| }, | ||
| testUnit: { | ||
| actual: m1.asTable().fieldConfig.overrides[0].properties[1].value, | ||
| expect: 'rps', | ||
| }, | ||
| testTStype: { | ||
| actual: m1.asTable().type, | ||
| expect: 'table', | ||
| }, | ||
| testTSversion: { | ||
| actual: m1.asTimeSeries().pluginVersion, | ||
| expect: 'v11.0.0', | ||
| }, | ||
| testTSUid: { | ||
| actual: m1.asTimeSeries().datasource, | ||
| expect: { | ||
| uid: '${datasource}', | ||
| type: 'prometheus', | ||
| }, | ||
| }, | ||
| }), | ||
| }, | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
minor nit here as
overrides[0].properties[1].valueis not quite as readable asdefaults.unit.Would be good to have a comment for future maintainers explaining just what field is being looked at and why it's done in this manner
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is a global place to to put units into any panel (fieldConfig.defaults.unit). But it will be used by multiple signals you can attach to a panel.
So in commonlib I decided to move units into overrides in order to make sure that units setting only applies to the specific signal. So that is why so long path in unit tests.