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.

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

Add Application to datasource configuration #1107

Open
wants to merge 24 commits into
base: main
Choose a base branch
from

Conversation

benmali
Copy link

@benmali benmali commented Nov 29, 2024

Added 'Application' option to Datasource config instead of hardcoded 'Grafana-ADX'

@benmali benmali requested a review from a team as a code owner November 29, 2024 07:11
@CLAassistant
Copy link

CLAassistant commented Nov 29, 2024

CLA assistant check
All committers have signed the CLA.

Copy link
Contributor

@aangelisc aangelisc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @benmali, thank you for the PR. Just to clarify - is the purpose of this for tracking in ADX?

Additionally, it seems like you need to merge main as this PR is reverting some recent changes.

@benmali
Copy link
Author

benmali commented Nov 29, 2024

Yes the usage is for tracking the queries in ADX. Currently, we are using multiple ADX datasources with different configurations for the same ADX clusters. This gives us visibility on what "Application" (or datasource for that matter) was used to query ADX. PR updated

@benmali benmali requested a review from aangelisc December 3, 2024 14:06
@benmali
Copy link
Author

benmali commented Dec 8, 2024

Another use case I'm interested in is using Workload Groups by 'Application'. This will give us the ability to limit resources for heavy dashboard queries that are not production critical. https://learn.microsoft.com/en-us/kusto/management/workload-groups?view=microsoft-fabric#use-cases-for-custom-workload-groups

@benmali
Copy link
Author

benmali commented Jan 5, 2025

Hi @aangelisc, is there anything I can do on my side do push this? This is a feature we really want

@taleena
Copy link

taleena commented Jan 14, 2025

@benmali it looks like you still need to sign the CLA, and I suspect you need to update the PR as Andreas mentioned earlier if you haven't already. For the other use case you mentioned, would you mind putting in an issue feature request?

@benmali benmali force-pushed the feature/datasource_application branch 2 times, most recently from d768a27 to ec7092e Compare January 16, 2025 17:50
@benmali benmali force-pushed the feature/datasource_application branch from ec7092e to c3a0f2e Compare January 16, 2025 18:02
@benmali
Copy link
Author

benmali commented Jan 16, 2025

Hi @taleena , CLA signed. No need for a feature request regarding the workload groups in the meantime.
Why is the build pending now?

@adamyeats
Copy link
Contributor

@benmali I've run the CI (unfortunately we have to approve builds from external contributors, which is why it was pending) but it is currently failing the lint step, could you check the output and resolve the errors?

@benmali
Copy link
Author

benmali commented Jan 17, 2025

@adamyeats Should be fixed now. Please rerun

@benmali
Copy link
Author

benmali commented Jan 20, 2025

@adamyeats I see that I missed one function def. Hope it is fixed now

@benmali
Copy link
Author

benmali commented Jan 20, 2025

@adamyeats I see that the CI is failing beacause of missing libasound2 package.

I can see here https://launchpad.net/ubuntu/jammy/+package/libasound2 that this is an ubuntu 22.04 package, while the runner you are using is ubuntu-latest runner image, which is ubuntu 24.04 as described here: https://github.com/actions/runner-images

I'm guessing changing the runner to ubuntu-22.04 in the failing steps will solve this.

Also, discussed in this issue.
microsoft/playwright#30368

adamyeats and others added 3 commits January 21, 2025 12:20
…grafana#1148)

* Bump github.com/grafana/grafana-plugin-sdk-go from 0.260.1 to 0.263.0

Bumps [github.com/grafana/grafana-plugin-sdk-go](https://github.com/grafana/grafana-plugin-sdk-go) from 0.260.1 to 0.263.0.
- [Release notes](https://github.com/grafana/grafana-plugin-sdk-go/releases)
- [Commits](grafana/grafana-plugin-sdk-go@v0.260.1...v0.263.0)

---
updated-dependencies:
- dependency-name: github.com/grafana/grafana-plugin-sdk-go
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* go mod tidy

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Adam Yeats <[email protected]>
…rafana#1145)

Bumps [github.com/grafana/grafana-azure-sdk-go/v2](https://github.com/grafana/grafana-azure-sdk-go) from 2.1.3 to 2.1.5.
- [Release notes](https://github.com/grafana/grafana-azure-sdk-go/releases)
- [Changelog](https://github.com/grafana/grafana-azure-sdk-go/blob/main/CHANGELOG.md)
- [Commits](grafana/grafana-azure-sdk-go@v2.1.3...v2.1.5)

---
updated-dependencies:
- dependency-name: github.com/grafana/grafana-azure-sdk-go/v2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
dependabot bot added 7 commits January 21, 2025 12:54
Bumps [eslint-plugin-jsdoc](https://github.com/gajus/eslint-plugin-jsdoc) from 50.6.0 to 50.6.2.
- [Release notes](https://github.com/gajus/eslint-plugin-jsdoc/releases)
- [Changelog](https://github.com/gajus/eslint-plugin-jsdoc/blob/main/.releaserc)
- [Commits](gajus/eslint-plugin-jsdoc@v50.6.0...v50.6.2)

---
updated-dependencies:
- dependency-name: eslint-plugin-jsdoc
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.0.11 to 3.2.3.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](cure53/DOMPurify@3.0.11...3.2.3)

---
updated-dependencies:
- dependency-name: dompurify
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [cypress](https://github.com/cypress-io/cypress) from 13.16.0 to 14.0.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](cypress-io/cypress@v13.16.0...v14.0.0)

---
updated-dependencies:
- dependency-name: cypress
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [cspell](https://github.com/streetsidesoftware/cspell/tree/HEAD/packages/cspell) from 8.16.1 to 8.17.2.
- [Release notes](https://github.com/streetsidesoftware/cspell/releases)
- [Changelog](https://github.com/streetsidesoftware/cspell/blob/main/packages/cspell/CHANGELOG.md)
- [Commits](https://github.com/streetsidesoftware/cspell/commits/v8.17.2/packages/cspell)

---
updated-dependencies:
- dependency-name: cspell
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 9.1.0 to 10.0.1.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/eslint-config-prettier@v9.1.0...v10.0.1)

---
updated-dependencies:
- dependency-name: eslint-config-prettier
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [terser-webpack-plugin](https://github.com/webpack-contrib/terser-webpack-plugin) from 5.3.10 to 5.3.11.
- [Release notes](https://github.com/webpack-contrib/terser-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/terser-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](webpack-contrib/terser-webpack-plugin@v5.3.10...v5.3.11)

---
updated-dependencies:
- dependency-name: terser-webpack-plugin
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) from 7.37.2 to 7.37.4.
- [Release notes](https://github.com/jsx-eslint/eslint-plugin-react/releases)
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](jsx-eslint/eslint-plugin-react@v7.37.2...v7.37.4)

---
updated-dependencies:
- dependency-name: eslint-plugin-react
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@adamyeats
Copy link
Contributor

@benmali Apologies for the difficulties here! I think one more rebase from main should be enough to get us over the tine here. Thanks for your patience!

@benmali
Copy link
Author

benmali commented Jan 21, 2025

@adamyeats Done

adamyeats
adamyeats previously approved these changes Jan 21, 2025
Copy link
Contributor

@adamyeats adamyeats left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @benmali, LGTM!

@benmali benmali dismissed adamyeats’s stale review January 21, 2025 19:28

The merge-base changed after approval.

@adamyeats
Copy link
Contributor

Note for @grafana/partner-datasources: parts of the pipeline are broken here at the moment. I'm merging this in anyway for now so we can unblock this.

adamyeats
adamyeats previously approved these changes Jan 21, 2025
@adamyeats adamyeats dismissed aangelisc’s stale review January 21, 2025 19:32

Stale, feedback has been resolved

@benmali benmali dismissed adamyeats’s stale review January 21, 2025 19:33

The merge-base changed after approval.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants