Skip to content
This repository has been archived by the owner on Oct 18, 2024. It is now read-only.

Commit

Permalink
Release 1.0.4 (#28)
Browse files Browse the repository at this point in the history
* Updates from v1.0.x, screenshots changes & dependency update (#26)

* Bump version to 1.0.2

* Update grafana-aws-sdk to 0.5.0

* Docs: Update README screenshots

* Update prismjs

* Update screenshots links

* Release 1.0.4
  • Loading branch information
Elfo404 authored Apr 16, 2021
1 parent ae6af69 commit 6a32d3c
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 33 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ http.cors.allow-origin: "*"

### Index settings

![Elasticsearch data source details](./docs/img/elasticsearch-details.png)
![Elasticsearch data source details](https://raw.githubusercontent.com/grafana/open-distro-for-elasticsearch-grafana-datasource/master/docs/img/elasticsearch-details.png)

Here you can specify a default for the `time field` and specify the name of your Elasticsearch index. You can use
a time pattern for the index name or a wildcard.
Expand Down Expand Up @@ -94,7 +94,7 @@ Each data link configuration consists of:

## Metric Query editor

![Elasticsearch Query Editor](./docs/img/query-editor.png)
![Elasticsearch Query Editor](https://raw.githubusercontent.com/grafana/open-distro-for-elasticsearch-grafana-datasource/master/docs/img/query-editor.png)

The Elasticsearch query editor allows you to select multiple metrics and group by multiple terms or filters. Use the plus and minus icons to the right to add/remove
metrics or group by clauses. Some metrics and group by clauses haves options, click the option text to expand the row to view and edit metric or group by options.
Expand All @@ -113,7 +113,7 @@ You can control the name for time series via the `Alias` input field.

Some metric aggregations are called Pipeline aggregations, for example, _Moving Average_ and _Derivative_. Elasticsearch pipeline metrics require another metric to be based on. Use the eye icon next to the metric to hide metrics from appearing in the graph. This is useful for metrics you only have in the query for use in a pipeline metric.

![Pipeline aggregation editor](./docs/img/pipeline-aggregation-editor.png)
![Pipeline aggregation editor](https://raw.githubusercontent.com/grafana/open-distro-for-elasticsearch-grafana-datasource/master/docs/img/pipeline-aggregation-editor.png)

## Templating

Expand Down Expand Up @@ -163,7 +163,7 @@ There are two syntaxes:
Why two ways? The first syntax is easier to read and write but does not allow you to use a variable in the middle of a word. When the _Multi-value_ or _Include all value_
options are enabled, Grafana converts the labels from plain text to a lucene compatible condition.

![Query with template variables](./docs/img/templating-query.png)
![Query with template variables](https://raw.githubusercontent.com/grafana/open-distro-for-elasticsearch-grafana-datasource/master/docs/img/templating-query.png)

In the above example, we have a lucene query that filters documents based on the `@hostname` property using a variable named `$hostname`. It is also using
a variable in the _Terms_ group by field input box. This allows you to use a variable to quickly change how the data is grouped.
Expand Down Expand Up @@ -256,4 +256,4 @@ In order to sign requests to your Amazon Elasticsearch Service domain, SigV4 can
Once AWS SigV4 is enabled, it can be configured on the Elasticsearch data source configuration page. Refer to [Cloudwatch authentication](https://grafana.com/docs/grafana/latest/datasources/cloudwatch/#authentication) for more information about authentication options.
![SigV4 configuration for AWS Elasticsearch Service](./docs/img/sigv4.png)
![SigV4 configuration for AWS Elasticsearch Service](https://raw.githubusercontent.com/grafana/open-distro-for-elasticsearch-grafana-datasource/master/docs/img/sigv4.png)
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "grafana-es-open-distro-datasource",
"version": "1.0.3",
"version": "1.0.4",
"description": "",
"scripts": {
"build": "grafana-toolkit plugin:build",
Expand All @@ -25,7 +25,7 @@
"@types/enzyme": "3.10.5",
"@types/jest": "26.0.15",
"@types/lodash": "latest",
"@types/prismjs": "1.16.0",
"@types/prismjs": "1.16.5",
"@types/react": "16.9.9",
"@types/react-test-renderer": "16.9.2",
"@typescript-eslint/eslint-plugin": "4.0.1",
Expand All @@ -41,7 +41,7 @@
"eslint-plugin-react-hooks": "4.1.2",
"jest": "26.6.3",
"prettier": "1.19.1",
"prismjs": "1.21.0",
"prismjs": "1.23.0",
"react": "17.0.1",
"react-dom": "17.0.1",
"react-use": "13.27.0",
Expand Down
34 changes: 9 additions & 25 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -983,23 +983,7 @@
typescript "4.1.2"
yaml "^1.8.3"

"@grafana/eslint-config@2.3.0":
version "2.3.0"
resolved "https://npm.pkg.github.com/download/@grafana/eslint-config/2.3.0/8ce8037d487bee6442d00a65e93ab4e895e7332513ca90c8b3f94440874290db#2d053d488854e2fcbaa1ebc0ed4c0258fc014aa4"
integrity sha512-QX9QbgT6nehLU91HncdE0bXEaGLmB7tSyxyj60+lQYWPygaoFUCsQWKBYxBRsyTYQahQGqkfS+y3scvkCLDCcw==
dependencies:
"@typescript-eslint/eslint-plugin" "4.15.0"
"@typescript-eslint/parser" "4.15.0"
eslint "7.21.0"
eslint-config-prettier "7.2.0"
eslint-plugin-jsdoc "31.6.1"
eslint-plugin-prettier "3.3.1"
eslint-plugin-react "7.22.0"
eslint-plugin-react-hooks "4.2.0"
prettier "2.2.1"
typescript "4.1.3"

"@grafana/eslint-config@^2.3.0":
"@grafana/eslint-config@2.3.0", "@grafana/eslint-config@^2.3.0":
version "2.3.0"
resolved "https://registry.yarnpkg.com/@grafana/eslint-config/-/eslint-config-2.3.0.tgz#2d053d488854e2fcbaa1ebc0ed4c0258fc014aa4"
integrity sha512-QX9QbgT6nehLU91HncdE0bXEaGLmB7tSyxyj60+lQYWPygaoFUCsQWKBYxBRsyTYQahQGqkfS+y3scvkCLDCcw==
Expand Down Expand Up @@ -2053,10 +2037,10 @@
resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz#ef65165aea2924c9359205bf748865b8881753c0"
integrity sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA==

"@types/prismjs@1.16.0":
version "1.16.0"
resolved "https://registry.yarnpkg.com/@types/prismjs/-/prismjs-1.16.0.tgz#4328c9f65698e59f4feade8f4e5d928c748fd643"
integrity sha512-mEyuziLrfDCQ4juQP1k706BUU/c8OGn/ZFl69AXXY6dStHClKX4P+N8+rhqpul1vRDA2VOygzMRSJJZHyDEOfw==
"@types/prismjs@1.16.5":
version "1.16.5"
resolved "https://registry.yarnpkg.com/@types/prismjs/-/prismjs-1.16.5.tgz#378f491ff02304ce50924b05283111d4a286ecba"
integrity sha512-nSU7U6FQDJJCraFNwaHmH5YDsd/VA9rTnJ7B7AGFdn+m+VSt3FjLWN7+AbqxZ67dbFazqtrDFUto3HK4ljrHIg==

"@types/prop-types@*":
version "15.7.3"
Expand Down Expand Up @@ -10251,10 +10235,10 @@ pretty-format@^26.0.0, pretty-format@^26.6.2:
ansi-styles "^4.0.0"
react-is "^17.0.1"

prismjs@1.21.0:
version "1.21.0"
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.21.0.tgz#36c086ec36b45319ec4218ee164c110f9fc015a3"
integrity sha512-uGdSIu1nk3kej2iZsLyDoJ7e9bnPzIgY0naW/HdknGj61zScaprVEVGHrPoXqI+M9sP0NDnTK2jpkvmldpuqDw==
prismjs@1.23.0:
version "1.23.0"
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.23.0.tgz#d3b3967f7d72440690497652a9d40ff046067f33"
integrity sha512-c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA==
optionalDependencies:
clipboard "^2.0.0"

Expand Down

0 comments on commit 6a32d3c

Please sign in to comment.