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

fix(templates): add jmeter template #15168

Merged
merged 10 commits into from
Sep 26, 2019
Merged

fix(templates): add jmeter template #15168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f145b03
fix(templates): add jmeter template
russorat Sep 13, 2019
d313937
fix(defaultTemplates): missing comma
Sep 16, 2019
d31f977
fix(package): update influxdb-template library
Sep 26, 2019
280ef50
fix(ui): updating yarn.lock
Sep 26, 2019
bb079f3
fix(templates): add jmeter template
russorat Sep 13, 2019
1e2cd10
fix(defaultTemplates): missing comma
Sep 16, 2019
110c48d
fix(package): update influxdb-template library
Sep 26, 2019
4490634
fix(ui): updating yarn.lock
Sep 26, 2019
081d001
rebase from master
Sep 26, 2019
5ed68a0
Updated CHANGELOG
russorat Sep 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
### Features

1. [15151](https://github.com/influxdata/influxdb/pull/15151): Add jsonweb package for future JWT support
1. [15168](https://github.com/influxdata/influxdb/pull/15168): Added the JMeter Template dashboard

### UI Improvements

Expand Down
2 changes: 1 addition & 1 deletion ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
"@influxdata/flux-parser": "^0.3.0",
"@influxdata/giraffe": "0.16.3",
"@influxdata/influx": "0.5.5",
"@influxdata/influxdb-templates": "0.8.0",
"@influxdata/influxdb-templates": "0.9.0",
"@influxdata/react-custom-scrollbars": "4.3.8",
"abortcontroller-polyfill": "^1.3.0",
"axios": "^0.19.0",
Expand Down
3 changes: 3 additions & 0 deletions ui/src/templates/constants/defaultTemplates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import {
docker,
gettingStarted,
github,
jmeter,
kubernetes,
nginx,
ossMetrics,
Expand All @@ -20,6 +21,7 @@ export const staticTemplates: {[k: string]: DashboardTemplate} = {
Docker: docker,
'getting-started': gettingStarted,
Github: github,
JMeter: jmeter,
Kubernetes: kubernetes,
Nginx: nginx,
'oss-metrics': ossMetrics,
Expand All @@ -32,6 +34,7 @@ export const influxdbTemplateList: DashboardTemplate[] = [
docker,
gettingStarted,
github,
jmeter,
kubernetes,
nginx,
ossMetrics,
Expand Down
8 changes: 4 additions & 4 deletions ui/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,10 +1102,10 @@
dependencies:
axios "^0.19.0"

"@influxdata/influxdb-templates@0.8.0":
version "0.8.0"
resolved "https://registry.yarnpkg.com/@influxdata/influxdb-templates/-/influxdb-templates-0.8.0.tgz#16e5f8c157b8c02bb6e5fa657a805b85d97b920b"
integrity sha512-e+tx021ZWR/cYb6Q+IpH8zFAyF/HeNEp/3Auu1K3OOaMU6nxJ8AnG4tpAlWbjGoSa/lqUYbZKv65w7nWxboH5Q==
"@influxdata/influxdb-templates@0.9.0":
version "0.9.0"
resolved "https://registry.yarnpkg.com/@influxdata/influxdb-templates/-/influxdb-templates-0.9.0.tgz#d4b1f727c8949147d2ade63f5754425a0d1a0e9d"
integrity sha512-R/QhYJz+nNPGT8LkWHXKOLYYUROavDPfIFoGP7sIrxhStjm+hb0TzHYeQ75HLPQqKh54zCB8cv/TINwRgijYBw==

"@influxdata/[email protected]":
version "0.4.0"
Expand Down