Remove unneeded endpoints from load test client, pull in existing loa…

…d test dashboard
grafana · Aug 30, 2021 · 1bc0237 · 1bc0237
1 parent bdd45cf
commit 1bc0237
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/...oning/dashboards/general/graph_panel.json → devenv/loadtest/fixtures/graph_panel.json b/...oning/dashboards/general/graph_panel.json → devenv/loadtest/fixtures/graph_panel.json
diff --git a/devenv/loadtest/modules/client.js b/devenv/loadtest/modules/client.js
@@ -24,10 +24,6 @@ export const DatasourcesEndpoint = class DatasourcesEndpoint {
  update(id, payload) {
  return this.httpClient.put(`/datasources/${id}`, JSON.stringify(payload));
  }
-
- delete(id) {
- return this.httpClient.delete(`/datasources/${id}`);
- }
 };
 
 export const DashboardsEndpoint = class DashboardsEndpoint {
@@ -42,10 +38,6 @@ export const DashboardsEndpoint = class DashboardsEndpoint {
  upsert(payload) {
  return this.httpClient.post(`/dashboards/db`, JSON.stringify(payload));
  }
-
- delete(id) {
- return this.httpClient.delete(`/dashboards/uid/${id}`);
- }
 };
 
 export const OrganizationsEndpoint = class OrganizationsEndpoint {
@@ -67,10 +59,6 @@ export const OrganizationsEndpoint = class OrganizationsEndpoint {
  };
  return this.httpClient.post(`/orgs`, JSON.stringify(payload));
  }
-
- delete(id) {
- return this.httpClient.delete(`/orgs/${id}`);
- }
 };
 
 export const UIEndpoint = class UIEndpoint {

diff --git a/devenv/loadtest/modules/util.js b/devenv/loadtest/modules/util.js
@@ -20,11 +20,11 @@ export const createTestOrgIfNotExists = (client) => {
  return res.json().id;
 };
 
-export const upsertTestdataDatasource = (client) => {
+export const upsertTestdataDatasource = (client, name) => {
  const payload = {
  access: 'proxy',
  isDefault: false,
- name: 'k6-image-renderer-testdata',
+ name,
  type: 'testdata',
  };
 

diff --git a/devenv/loadtest/render_test.js b/devenv/loadtest/render_test.js
@@ -13,7 +13,7 @@ export let options = {
 
 let endpoint = __ENV.URL || 'http://localhost:3000';
 const client = createClient(endpoint);
-const dashboard = JSON.parse(open('fixtures/image-renderer-perf-dashboard.json'));
+const dashboard = JSON.parse(open('fixtures/graph_panel.json'));
 
 export const setup = () => {
  let grafanaSession;
@@ -27,7 +27,7 @@ export const setup = () => {
 
  const orgId = createTestOrgIfNotExists(client);
  client.withOrgId(orgId);
- upsertTestdataDatasource(client);
+ upsertTestdataDatasource(client, dashboard.panels[0].datasource);
  upsertTestdataDashboard(client, dashboard);
 
  return {

diff --git a/devenv/loadtest/run.sh b/devenv/loadtest/run.sh
@@ -26,7 +26,17 @@ run() {
  done
  shift $((OPTIND-1))
 
- docker run -t --network=host -v $PWD:/src -e URL=$url --rm -i loadimpact/k6:master run --vus $vus --duration $duration $iterationsOption /src/render_test.js
+ docker run \
+ -it \
+ --network=host \
+ --mount type=bind,source=$PWD,destination=/src \
+ -e URL=$url \
+ --rm \
+ loadimpact/k6:master run \
+ --vus $vus \
+ --duration $duration \
+ $iterationsOption \
+ /src/render_test.js
 }
 
 run "$@"