forked from grafana/grafana
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'grafana/master' into anno-panel
* grafana/master: (73 commits) docs: configuring custom headers in the dataproxy (grafana#17367) Explore: Queries the datasource once per run query and uses DataStreamObserver (grafana#17263) Feature: Adds redux action logging toggle from url params (grafana#17368) Build: Adds e2e tests back to master workflow with better error messages and with artifacts (grafana#17374) Explore: Handle datasources with long names better in ds picker (grafana#17393) Annotations: Improve annotation option tooltips (grafana#17384) InfluxDB: Fixes single quotes are not escaped (grafana#17398) Chore: Bump axios to 0.19.0 (grafana#17403) Alerting: golint fixes for alerting (grafana#17246) Batch disable users (grafana#17254) Chore: Remove unused properties in explore (grafana#17359) MySQL/Postgres/MSSQL: Add parsing for day, weeks and year intervals in macros (grafana#13086) Security: Prevent csv formula injection attack (grafana#17363) LDAP: remove unused function (grafana#17351) Enterprise: remove gofakeit dep (grafana#17344) Explore: Update time range before running queries (grafana#17349) Build(package.json): improve npm commands (grafana#17022) Chore: upgrade webpack analyser (grafana#17340) NewDataSourcePage: Add Grafana Cloud link (grafana#17324) CloudWatch: Avoid exception while accessing results (grafana#17283) ...
- Loading branch information
Showing
302 changed files
with
4,752 additions
and
4,827 deletions.
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
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,38 @@ | ||
| metricbeat.config: | ||
| modules: | ||
| path: ${path.config}/modules.d/*.yml | ||
| # Reload module configs as they change: | ||
| reload.enabled: false | ||
|
|
||
| metricbeat.autodiscover: | ||
| providers: | ||
| - type: docker | ||
| hints.enabled: true | ||
|
|
||
| metricbeat.modules: | ||
| - module: docker | ||
| metricsets: | ||
| - "container" | ||
| - "cpu" | ||
| - "diskio" | ||
| - "healthcheck" | ||
| - "info" | ||
| #- "image" | ||
| - "memory" | ||
| - "network" | ||
| hosts: ["unix:///var/run/docker.sock"] | ||
| period: 10s | ||
| enabled: true | ||
|
|
||
| processors: | ||
| - add_cloud_metadata: ~ | ||
|
|
||
| output.elasticsearch: | ||
| hosts: ["localhost:12200"] | ||
| index: "metricbeat-%{+yyyy.MM.dd}" | ||
|
|
||
| setup.template.name: "metricbeat" | ||
| setup.template.pattern: "metricbeat-*" | ||
| setup.template.settings: | ||
| index.number_of_shards: 1 | ||
| index.number_of_replicas: 1 |
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,56 @@ | ||
| import { sleep, check, group } from 'k6'; | ||
| import { createBasicAuthClient } from './modules/client.js'; | ||
|
|
||
| export let options = { | ||
| noCookiesReset: true | ||
| }; | ||
|
|
||
| let endpoint = __ENV.URL || 'http://localhost:10080/grafana'; | ||
| const client = createBasicAuthClient(endpoint, 'user1', 'grafana'); | ||
| client.withOrgId(1); | ||
|
|
||
| export const setup = () => { | ||
| const adminClient = createBasicAuthClient(endpoint, 'admin', 'admin'); | ||
| let res = adminClient.datasources.getByName('gdev-prometheus'); | ||
| if (res.status !== 200) { | ||
| throw new Error('Expected 200 response status when creating datasource'); | ||
| } | ||
|
|
||
| return { | ||
| datasourceId: res.json().id, | ||
| }; | ||
| } | ||
|
|
||
| export default (data) => { | ||
| group("auth proxy test", () => { | ||
| group("batch proxy requests", () => { | ||
| const d = new Date(); | ||
| const batchCount = 300; | ||
| const requests = []; | ||
| const query = encodeURI('topk(5, max(scrape_duration_seconds) by (job))'); | ||
| const start = (d.getTime() / 1000) - 3600; | ||
| const end = (d.getTime() / 1000); | ||
| const step = 20; | ||
|
|
||
| requests.push({ method: 'GET', url: '/api/annotations?dashboardId=8&from=1558670300607&to=1558691900607' }); | ||
|
|
||
| for (let n = 0; n < batchCount; n++) { | ||
| requests.push({ | ||
| method: 'GET', | ||
| url: `/api/datasources/proxy/${data.datasourceId}/api/v1/query_range?query=${query}&start=${start}&end=${end}&step=${step}`, | ||
| }); | ||
| } | ||
|
|
||
| let responses = client.batch(requests); | ||
| for (let n = 0; n < batchCount; n++) { | ||
| check(responses[n], { | ||
| 'response status is 200': (r) => r.status === 200, | ||
| }); | ||
| } | ||
| }); | ||
| }); | ||
|
|
||
| sleep(5) | ||
| } | ||
|
|
||
| export const teardown = (data) => {} |
Oops, something went wrong.