Chore: Merge Main #7
Merged
Conversation
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
* Add undev command to the ./setup scrip of devenv * Update devenv/setup.sh Co-authored-by: Gabriel MABILLE <[email protected]> * include undev as usage --------- Co-authored-by: Gabriel MABILLE <[email protected]>
* refactor: make better use of info box for basic roles * linting fix
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
chore(npm): update babel dependencies to 7.23.2
…76683) * add aria-describedby, tooltip role and unit tests Co-authored-by: L-M-K-B <[email protected]> Co-authored-by: joshhunt <[email protected]> * remove `delayShow` so tooltip text is announced correctly * adjust IconButton, fix unit tests * undo tooltip aria-label change * only set aria-describedby if there's no aria-label --------- Co-authored-by: L-M-K-B <[email protected]> Co-authored-by: joshhunt <[email protected]>
Fix links to plugin-tools in changelog, breaking changes
* refactor: to check for feature toggle and for checking for jsonData field * fix tests * whitelisting of X-Prom-Label-Policy Header
* logs view * cant add a library * gzip doesnt work * remove link code :( * clean up * linter * linter * betterer. cant run this locally?? * Remove unneeded conversions * Return portal link for log queries from backend * Display portal link * Update tests * Lint * Prettier * Unused import * Add Azure Monitor to explore docs --------- Co-authored-by: Andreas Christou <[email protected]>
Co-authored-by: Isabel <[email protected]>
#76781) Fix hardcoded state reasons
* Swagger: Type postDashboardResponse.id as int instead of string * Swagger: Type postDashboardResponse.id as int64
* Add grafana program label command * remove space
…ctor (#76529) * Elasticsearch: move addhoc filters to modifyQuery and refactor * Elasticsearch: add support for number-value adhoc filters
* Change link arguments to ensure that they resolve correctly regardless of version Presently, the links take users to "latest" even if they are in other versions of documentation. Sometimes, the destination doesn't even exist in "latest". Signed-off-by: Jack Baldry <[email protected]> * Make myself CODEOWNER so I can ensure correct linking in the future Signed-off-by: Jack Baldry <[email protected]> * Apply suggestions from code review Co-authored-by: Eve Meelan <[email protected]> --------- Signed-off-by: Jack Baldry <[email protected]> Co-authored-by: Eve Meelan <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Alerting: post alerts to the remote Alertmanager and fetch them * fix broken tests * Alerting: Add Mimir Backend image to devenv (blocks) * add alerting as code owner for mimir_backend block * Alerting: Use Mimir image to run integration tests for the remote Alertmanager * skip integration test when running all tests * skipping integration test when no Alertmanager URL is provided * fix bad host for mimir_backend * remove basic auth testing until we have an nginx image in our CI * add integration tests for alerts * fix tests * change SendCtx -> Send, add context.Context to Send, fix CI * add reover() for functions from the Prometheus Alertmanager HTTP client that could panic * add TODO to implement PutAlerts in a way that mimicks what Prometheus does * fix log format
…76148) * fixes incorrect decoding for alert rules with % characters * Patch history package to stop decoding path * Rename rule id extraction function, update tests * Fix patch file * Fix copyFrom parameter encoding * Fix conflict commit * Fix test --------- Co-authored-by: Konrad Lalik <[email protected]> Co-authored-by: Sonia Aguilar <[email protected]>
* Add prefix for external service accounts
Swiching saml to authnz
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Fix typo in grafana-eslint-rules/README.md appropiate -> appropriate
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* introduce data source admin role and fix frontend check * introduce fixed roles for data source creator and team reader * add documentation * undo an unintended change
…oards (#76658) * Alerting: Move migration from background service run to ngalert init sqlite database write contention between the migration's single transaction and dashboard provisioning's frequent commits was causing the migration to fail with SQLITE_BUSY/SQLITE_BUSY_SNAPSHOT on all retries. This is not a new issue for sqlite+grafana, but the discrepancy between the length of the transactions was causing it to be very consistent. In addition, since a failed migration has implications on the assumed correctness of the alertmanager and alert rule definition state, we cause a server shutdown on error. This can make e2e tests as well as some high-load provisioned sqlite installations flaky on startup. The correct fix for this is better transaction management across various services and is out of scope for this change as we're primarily interested in mitigating the current bout of server failures in e2e tests when using sqlite.
* Team LBAC: Fix multiple header values Co-authored-by: Eric Leijonmarck <[email protected]> * Fix linter error --------- Co-authored-by: Eric Leijonmarck <[email protected]>
* refactor: move expand button to front * refactor: add grid + adjust level 2 * refactor: remove grid + fix alignment for all three levels * refactor: first iteration alignment * refactor: styling of MegaMenuItemIcon * refactor: remove styling of div in MegaMenuItemIcon * refactor: styling object * refactor: alignment of first level * refactor: alignment of second level * refactor: alignment of third level and active state * feat: add connecting line for level 3 * feat: add comment * refactor: remove unused code * refactor: clean up styling * refactor: clean up styling * refactor: clean up styling * some small tweaks * remove unused props from getStyles * fix dock button position and text ellipsing * add padding to container to prevent icon button overlapping on left side * add active overlay * adjust font-weight, add padding to RHS * add border-box for overlay * adjust menu width to 300, don't use non-integer levels * use height: 100% * don't think we need minWidth * make chevrons right/down * make url required, cut down css * move active state to container * remove unused class * add padding at top and bottom of menu as well * adjust chevron size --------- Co-authored-by: Ashley Harrison <[email protected]>
…#73020) * initial commit for PromQAIL * add feature toggle and start button * add drawer * set up drawer and state * fix styles and start the conditional text display * add data info list going to ai * add logos and style * metric display table style, neeed to make responsive * make feature toggle frontend only * add logic for want prompt for list or not, add helpers, addquerysuggestion type * make query suggestion component * add buttons to add or refine prompt * refactor logic to add interactions to have multiple AI or historical interactions * refactor and enable multiple questions, all flow * add colorful AI icon to drawer open button * fix linting * refactor for hooking up promQail app and only giving one suggestion * design fixes * fix next prompt button styling * historical suggestions give us 5, fixed that and some design things * hook up the api, provide defense filler if it's down, refactor lots * use query, fix linting * add metadata to explain for ai suggestions * styling fixes * give metadata for historical suggestions by parsing query on the fly * no prompt field to query-suggestion endpoint if prompt is empty * fix linting * use suggest rte for historical list, fix long code style * use suggest rte for historical list, fix long code style * fix historical bug * added prompt file * updated llm logic in explainer helper * bump @grafana/experimental from 1.7.0 to 1.7.2 * use llmservice and vectorservice * cleanup prompts + streaming explainer * promqail feature toggle: fix re-order * PromQL non-llm failback recommendation logic (#75469) * added template recommendation logic directly in helpers * also added selected labels to recommendation * PromQail: query gen: fix prompt formatting and fetch metric labels to be used (#75450) * PromQail: query gen: fix prompt formatting and fetch metric labels to be used * Code fixes as suggested * Use newly decided collection name for promql templates * Prometheus: Promqail tests and bug fixes (#75852) * add tests for drawer * refine one prompt at a time, fix css * scroll into view on interaction change * fix styles for light * disable prompt input after getting sugestions for that interaction * make buttons disappear after selecting refine prompt or show historical queries to prevent user from clicking many times * fix border radius * fix new eslint rule about css requiring objects and not template literals * add scrollIntoView for test * grafana_prometheus_promqail_explanation_feedback - add feedback rudderstack interaction for explanation * add form link to feedback for query suggestions * fix bugs * for prettier * PromQL Builder Explainer: Added promql documentation and updated prompt (#75593) * added promql documentation and updated prompt * refactor prompt generation into isolated function * updated prompt to answer with a question * removed commented code * updated metadata logic * updated documentation body logic * Prometheus: PromQAIL UI fixes (#76654) * align buttons at 16px * only autoscroll when an interaction has been added or the suggestions have been updated * add 12px below explain for suggested queries * add . after suggestion number * fix linting error * Prometheus: PromQAIL feedback improvements (#76711) * align buttons at 16px * only autoscroll when an interaction has been added or the suggestions have been updated * add 12px below explain for suggested queries * add . after suggestion number * add text indication for explanation feedback * add form for suggestion feedback, add form for not helpful explanation feedback * fix linting error * make radio button feedback required * required text, padding additions, thank you for your feedback * PromQL Builder Suggestion: Added type level templates and removed explainer steps for fallback suggestion logic (#75764) * adding more detailed templates to promql fallback suggest * remove debug logs * added missing explain logic * Fix brendan's type issue --------- Co-authored-by: Brendan O'Handley <[email protected]> Co-authored-by: bohandley <[email protected]> * make yarn.lock equal to current in main * fix feature toggles * fix prettier issues --------- Co-authored-by: Edward Qian <[email protected]> Co-authored-by: Yasir Ekinci <[email protected]> Co-authored-by: Edward Qian <[email protected]> Co-authored-by: Gerry Boland <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Remove oracle plugins as these have migrated
… from URL (#76806) Assert initial state of the query history without requiring correct order.
* Cancel streaming queries before running new queries * Cancel previous queries when a new query is run * Remove redundant dependency --------- Co-authored-by: Kristina Durivage <[email protected]>
Co-authored-by: Isabel <[email protected]>
Co-authored-by: Isabel <[email protected]>
…76838) Fix validate-npm-packages regex to work without suffix
* Ordered entries by date * Added ordering guidance to readme
chore: Removed LegacyForm from FolderSettingsPage
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Alerting: Fix HCL export for alerts with non-zero "for" field. Fixes #76734 * fix tests --------- Co-authored-by: Yuri Tseretyan <[email protected]>
… that are active (#76860) correctly highlight a sectionnavitem if it has children that are active
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Alerting: fetch receivers from remote Alertmanager * make linter happy * change require.Eventually() timeout and tick
* Rename label in TraceQL builder * Suggested enhancement added --------- Co-authored-by: André Pereira <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is this feature?
[Add a brief description of what the feature or update does.]
Why do we need this feature?
[Add a description of the problem the feature is trying to solve.]
Who is this feature for?
[Add information on what kind of user the feature is for.]
Which issue(s) does this PR fix?:
Fixes #
Special notes for your reviewer:
Please check that: