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

prometheus custom labels #278

Merged
merged 6 commits into from
Apr 6, 2020
Merged

prometheus custom labels #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
693b0f6
feat(metrics): allow passing custom labels to prometheus
users-search-assignment Apr 4, 2020
4229e94
chore(package): upgrade mocha version
users-search-assignment Apr 4, 2020
7a644e9
chore(package): update artillery version and package-lock
users-search-assignment Apr 6, 2020
db51ab7
chore(package): update artillery version and package-lock
users-search-assignment Apr 6, 2020
f04bbd1
chore(package): update artillery version and package-lock
users-search-assignment Apr 6, 2020
9788296
chore(package): update artillery version and package-lock
users-search-assignment Apr 6, 2020
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
docker_layer_caching: false
- restore_cache:
key: dependency-cache-{{ checksum "package.json" }}
# - run: npm audit
- run: npm audit --only=prod --audit-level=moderate
- run: npm run lint
- run: npm run unit-tests
- store_artifacts:
Expand Down
9 changes: 5 additions & 4 deletions docs/devguide/docs/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,11 @@ Additional parameters for the following chosen databases:
| METRICS_PLUGIN_NAME | metrics_plugin_name | Metrics integration to use [prometheus,influx] | ✓ | |

#### Prometheus
| Environment Variable | Configuration key | Description | Configurable from UI/API | Default value |
|---------------------- |------------------------------------- |-------------------------------------- |-------------------------- |--------------- |
| | prometheus_metrics.push_gateway_url | Url of push gateway | ✓ | |
| | prometheus_metrics.buckets_sizes | Bucket sizes to configure prometheus | ✓ | |
| Environment Variable | Configuration key | Description | Configurable from UI/API | Default value |
|---------------------- |------------------------------------- |---------------------------------------------------|-------------------------- |--------------- |
| | prometheus_metrics.push_gateway_url | Url of push gateway | ✓ | |
| | prometheus_metrics.buckets_sizes | Bucket sizes to configure prometheus | ✓ | |
| | prometheus_metrics.labels | Labels will be passed to the push gateway | ✓ | |

#### Influx
| Environment Variable | Configuration key | Description | Configurable from UI/API | Default value |
Expand Down
13 changes: 9 additions & 4 deletions docs/devguide/docs/swagger-docs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1865,6 +1865,11 @@ components:
buckets_sizes:
type: string
description: Bucket sizes use to configure prometheus.
labels:
description: Labels which will be passed to prometheus push gateway.
type: object
additionalProperties:
type: string
smtp_server:
additionalProperties: false
type: object
Expand Down Expand Up @@ -1922,15 +1927,15 @@ components:
- $ref: '#/components/schemas/benchmark_weights'
server_errors:
description: 5xx server errors benchmark weight
allOf:
allOf:
- $ref: '#/components/schemas/benchmark_weights'
client_errors:
description: 4xx server errors benchmark weight
allOf:
allOf:
- $ref: '#/components/schemas/benchmark_weights'
rps:
description: requests per second benchmark weight
allOf:
allOf:
- $ref: '#/components/schemas/benchmark_weights'
benchmark_weights:
type: object
Expand All @@ -1943,4 +1948,4 @@ components:
description: benchmark factor weight
percentage:
type: number
description: benchmark percentage weight
description: benchmark percentage weight
13 changes: 9 additions & 4 deletions docs/openapi3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2146,6 +2146,11 @@ components:
buckets_sizes:
type: string
description: Bucket sizes use to configure prometheus.
labels:
description: Labels which will be passed to prometheus push gateway.
type: object
additionalProperties:
type: string
smtp_server:
additionalProperties: false
type: object
Expand Down Expand Up @@ -2203,15 +2208,15 @@ components:
- $ref: '#/components/schemas/benchmark_weights'
server_errors:
description: 5xx server errors benchmark weight
allOf:
allOf:
- $ref: '#/components/schemas/benchmark_weights'
client_errors:
description: 4xx server errors benchmark weight
allOf:
allOf:
- $ref: '#/components/schemas/benchmark_weights'
rps:
description: requests per second benchmark weight
allOf:
allOf:
- $ref: '#/components/schemas/benchmark_weights'
benchmark_weights:
type: object
Expand All @@ -2224,4 +2229,4 @@ components:
description: benchmark factor weight
percentage:
type: number
description: benchmark percentage weight
description: benchmark percentage weight
Loading