Skip to content

Commit

Permalink
Update to Grafana 8 (#1300)
Browse files Browse the repository at this point in the history
* update dependencies

* ignore comp tests for a while

* Metrics: comment BarChart

* remove selectThemeVariant

* fix tests

* increase node's memory

* add missing EOF

* update digiapulssi-breadcrumb-panel

* update yesoreyeram-boomtable-panel

* update natel-discrete-panel

* update grafana-polystat-panel

* update grafana-piechart-panel

* update grafana-worldmap-panel

* update camptocamp-prometheus

* fix plugin.json

* increase memory on all tasks

* rearrange panel

* rearrange panel

* rearrange panel

* rearrange panel

* rearrange panel

* rearrange panel

* rearrange panel

* fix plugins

* remove vertamedia-clickhouse-datasource

* Revert "remove vertamedia-clickhouse-datasource"

This reverts commit 0285eb8.

* PMM-8412-v8.3.3 Fix stylings and lint errors

* replace vertamedia

* update grafana-clickhouse-datasource

* update clickhouse plugin

* add old version of vertamedia

* move plugin out of dist folder

* PMM-9521 add barChart component (#1309)

* PMM-9521-add-BarChart: add barChart

* Delete docker-compose.local.yaml

* PMM-9521-add-BarChart: fix tests

* PMM-9521 git uses https vs ssh

* PMM-9521 git uses https vs ssh for codecov

* PMM_9521 ignore local docker-compose.yaml as well

* PMM-9521 ignore .vscode

* PMM-9521 simplify the build workflow

* PMM-9521-add-BarChart: fix code review edits

* PMM-9521-add-BarChart: fix grace in barChart

* PMM-9521-add-BarChart: fix package.json ssh to http

* PMM-9521-add-BarChart: previous package.json types/grafana value

* PMM-9521-add-BarChart: fix to https with [email protected]

* PMM-9521-add-BarChart: revert Alex changes with ssh->https

* PMM-9521-add-BarChart: code-review fix

* PMM-9521-add-BarChart: code-review fix

Co-authored-by: Alex Tymchuk <[email protected]>

* PMM-8412 update deps

* PMM-8412 Fix QAN error

Co-authored-by: Tiago Mota Santos <[email protected]>
Co-authored-by: Iaroslavna Soloveva <[email protected]>
Co-authored-by: Alex Tymchuk <[email protected]>
  • Loading branch information
4 people authored Feb 23, 2022
1 parent d2acb89 commit 2951113
Show file tree
Hide file tree
Showing 461 changed files with 23,054 additions and 31,595 deletions.
40 changes: 10 additions & 30 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,18 @@ jobs:

steps:
- uses: percona-platform/checkout@v2

- name: Build grafana-dashboards
uses: percona-platform/setup-node@v2
with:
node-version: 14

- name: Enable node_modules cache
uses: percona-platform/cache@v2
with:
path: |
node_modules
*/*/node_modules
~/.npm
key: ${{ runner.os }}-node-${{ matrix.node-version }}-yarn-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-${{ matrix.node-version }}-yarn-
node-version: "14"
cache: "npm"

- run: make prepare_release

- run: make build_package

- name: Upload Built interface
- name: Upload the build artefacts
uses: percona-platform/upload-artifact@v2
with:
name: build-dist
Expand All @@ -38,16 +30,14 @@ jobs:
needs: build
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [14.x]

steps:
- uses: percona-platform/checkout@v2
- name: Generate and upload code coverage

- name: Setup NodeJS
uses: percona-platform/setup-node@v2
with:
node-version: ${{ matrix.node-version }}
node-version: "14"
cache: "npm"
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_GRAFANA_DASHBOARDS_TOKEN }}

Expand All @@ -57,18 +47,8 @@ jobs:
name: build-dist
path: pmm-app/dist/

- name: Enable node_modules cache
uses: percona-platform/cache@v2
with:
path: |
node_modules
*/*/node_modules
~/.npm
key: ${{ runner.os }}-node-${{ matrix.node-version }}-yarn-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-${{ matrix.node-version }}-yarn-
- run: make prepare_release

- run: make generate_coverage

workflow_success:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
.idea
.vscode
.DS_Store

# development
.env/
node_modules
docker-compose.*.yml
docker-compose.*.y*ml

# PMM-specific
dashboards/PMM_Demo.json
Expand Down
58 changes: 58 additions & 0 deletions panels/camptocamp-prometheus-alertmanager-datasource/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
## 1.0.0 (Feb 12, 2021)

- IMPROVEMENTS

* Rewrite plugin to match latest dev standards (Typescript, Yarn)
* Add support of latest Grafana versions

## 0.0.8 (Apr 22, 2020)

- IMPROVEMENTS

* Add support of variable templating ([#55](https://github.com/camptocamp/grafana-prometheus-alertmanager-datasource/pull/55))

- BUGFIX

* Fix datasource request ([#73](https://github.com/camptocamp/grafana-prometheus-alertmanager-datasource/pull/73))

## 0.0.7 (Jan 25, 2019)

- IMPROVEMENTS

* Allow undefined severity labels ([#44](https://github.com/camptocamp/grafana-prometheus-alertmanager-datasource/issues/44))
* Allow usage of multi-values variables ([#40](https://github.com/camptocamp/grafana-prometheus-alertmanager-datasource/issues/40))

- BUGFIX

* Fix blank severity column ([#31](https://github.com/camptocamp/grafana-prometheus-alertmanager-datasource/issues/31))

## 0.0.6 (May 22, 2018)

* Use Apache License 2.0
* Fix severity labels struct (#26)

## 0.0.5 (May 23, 2018)

- Datasource:

* Display annotations and labels in separate columns
* Add a selector in query editor to choose the columns to display

## 0.0.4 (March 29, 2018)

- Datasource:

* Allow manual definition of severity levels
* Fix templating and add support of All and Multi variables

## 0.0.3 (December 01, 2017)

- Datasource:

* Add templating support

## 0.0.2 (December 01, 2017)

- Datasource:

* Add support annotations
35 changes: 35 additions & 0 deletions panels/camptocamp-prometheus-alertmanager-datasource/MANIFEST.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

{
"manifestVersion": "2.0.0",
"signatureType": "community",
"signedByOrg": "camptocamp",
"signedByOrgName": "camptocamp",
"plugin": "camptocamp-prometheus-alertmanager-datasource",
"version": "1.0.0",
"time": 1622191623287,
"keyId": "7e4d0c6a708866e7",
"files": {
"module.js.map": "27128d3401e8627e13a91d1bcc2685985498612d93d705f7522042aa7e122e52",
"README.md": "6da412b443f386ce50ae6e997010d5ae33d6dcae8096faa0375d642f0591aa1c",
"img/json-logo.svg": "46391ecc7193b255fc8569cdd4920844b70feb1f7a9defd0658e70ace5928094",
"img/overview.png": "2429541675a221397e910a7f19cc5cf5aa914cb6f8cb7dd341521566a9e830d1",
"img/table.png": "a828db899e56d878307fdf61b492505248dfd9bf249479263f96e47bfccdefa5",
"LICENSE": "9a4b2ed0be524afe30376bb71435bc1b1c6cdcb058abe7206154caa92bc50cc6",
"module.js": "94c715553df3f95b9bcc5710e0d5e435bdfb705652ee93d5ecbf9bddb85d546c",
"CHANGELOG.md": "5316055bf65e83dba57f4ae5cba708a18e0239190635459e23201de60b6b99d3",
"plugin.json": "658a658fab9a8d3f4170944cb60427adc797b2e6aa2532c90eb0c0e96582734e"
}
}
-----BEGIN PGP SIGNATURE-----
Version: OpenPGP.js v4.10.1
Comment: https://openpgpjs.org

wqAEARMKAAYFAmCwrgcACgkQfk0ManCIZueiVgIFEEBtcjBg05y9cFxlIPBd
/NnS99U/NOr27kNLVxd5PA6GYRhzVio/DDnmq63ff2CoJCBVnc/KyWi+uwH+
S0xZAEICBju3YVTX/75s4VwjPYZgTs5xPUJL/+hT3J4uc4Ebnyrt1SJ7uWLg
Na0Py53QHY5sj0N6u8wwAw3T7+KWyo4eNo7w
=ad+C
-----END PGP SIGNATURE-----
49 changes: 49 additions & 0 deletions panels/camptocamp-prometheus-alertmanager-datasource/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Grafana datasource for Prometheus Alertmanager

This datasource lets you use the Alertmanager's API of Prometheus to create dashboards in Grafana.

![Overview](https://raw.githubusercontent.com/camptocamp/grafana-prometheus-alertmanager-datasource/master/images/overview.png)

# Usage

## Query Editor

The following options are available:

### Receiver

Only retrieve alerts that match the defined receiver. If left empty, all receivers will be matched.

### Filters

Into the query expression field, you can set filters.

Examples:

- `alertname="HostDown"` will only display alerts which has the label *alertname* equals to "HostDown".
- `severity="1"` will only display alerts which has the label *severity* equals to "1".

You can also set multiple filters like `alertname="DiskFull",df="opt"`.

### Active

Whether the alerts gathered should be active.

### Silenced

Whether the alerts gathered should be silenced.

### Inhibited

Whether the alerts gathered should be inhibited.

![Parameters](https://raw.githubusercontent.com/camptocamp/grafana-prometheus-alertmanager-datasource/master/images/table.png)

# Development Setup

Usage of Yarn is encouraged to build.

```shell
$ yarn install
$ yarn run build
```

This file was deleted.

This file was deleted.

Loading

0 comments on commit 2951113

Please sign in to comment.