Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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 .changelog-archive/CHANGELOG.06.md
Original file line number Diff line number Diff line change
Expand Up @@ -1254,7 +1254,7 @@ repo on July 1st. Make sure you have switched to the new repo by then. The new r
- **Postgres/MySQL/MSSQL**: Nanosecond timestamp support (`$__unixEpochNanoFilter`, `$__unixEpochNanoFrom`, `$__unixEpochNanoTo`) [#14711](https://github.com/grafana/grafana/pull/14711), thx [@ander26](https://github.com/ander26)
- **Provisioning**: Fixes bug causing infinite growth in dashboard_version table. [#12864](https://github.com/grafana/grafana/issues/12864)
- **Auth**: Prevent password reset when login form is disabled or either LDAP or Auth Proxy is enabled [#14246](https://github.com/grafana/grafana/issues/14246), thx [@SilverFire](https://github.com/SilverFire)
- **Admin**: Fix prevent removing last grafana admin permissions [#11067](https://github.com/grafana/grafana/issues/11067), thx [@danielbh](https://github.com/danielbh)
- **Admin**: Fix prevent removing last hyperiq admin permissions [#11067](https://github.com/grafana/grafana/issues/11067), thx [@danielbh](https://github.com/danielbh)
- **Admin**: When multiple user invitations, all links are the same as the first user who was invited [#14483](https://github.com/grafana/grafana/issues/14483)
- **LDAP**: Upgrade go-ldap to v3 [#14548](https://github.com/grafana/grafana/issues/14548)
- **OAuth**: Support OAuth providers that are not RFC6749 compliant [#14562](https://github.com/grafana/grafana/issues/14562), thx [@tdabasinskas](https://github.com/tdabasinskas)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"id": 13,
"options": {
"content": "\n# Welcome to Grafana 7.4\n\nGrafana v7.4 is adds many new enhancements to visualizations, transformations, tracing, security, auditing \u0026 more. This dashboard highlights \nsome of the new visualization capabilities. \n\n[Read the what's new article](https://grafana.com/docs/grafana/latest/whatsnew/whats-new-in-v7-4/) | \n[Download](https://grafana.com/grafana/download/beta)",
"content": "\n# Welcome to Cloudian® HyperIQ 7.4\n\nGrafana v7.4 is adds many new enhancements to visualizations, transformations, tracing, security, auditing \u0026 more. This dashboard highlights \nsome of the new visualization capabilities. \n\n[Read the what's new article](https://grafana.com/docs/grafana/latest/whatsnew/whats-new-in-v7-4/) | \n[Download](https://grafana.com/grafana/download/beta)",
"mode": "markdown"
},
"pluginVersion": "7.4.0-beta1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"id": 13,
"options": {
"content": "\n# Welcome to Grafana 8.0\n\nGrafana v8.0 adds many visualizations and improvements to panel edit, tracing and security. This dashboard highlights \nsome of the new visualization capabilities. There are so many new visualizations and display options so be sure to scroll down\nto see everything. \n\n[Read the what's new article](https://grafana.com/docs/grafana/next/whatsnew/whats-new-in-v8-0/) \u0026nbsp; | \u0026nbsp;\n[Download](https://grafana.com/grafana/download/beta) \u0026nbsp; | \u0026nbsp;\n[Grafana Cloud now free with 50gb logs, 10K metric series](https://grafana.com/signup/cloud/connect-account?pg=play\u0026plcmt=whatnew)",
"content": "\n# Welcome to Cloudian® HyperIQ 8.0\n\nGrafana v8.0 adds many visualizations and improvements to panel edit, tracing and security. This dashboard highlights \nsome of the new visualization capabilities. There are so many new visualizations and display options so be sure to scroll down\nto see everything. \n\n[Read the what's new article](https://grafana.com/docs/grafana/next/whatsnew/whats-new-in-v8-0/) \u0026nbsp; | \u0026nbsp;\n[Download](https://grafana.com/grafana/download/beta) \u0026nbsp; | \u0026nbsp;\n[Grafana Cloud now free with 50gb logs, 10K metric series](https://grafana.com/signup/cloud/connect-account?pg=play\u0026plcmt=whatnew)",
"mode": "markdown"
},
"pluginVersion": "8.1.0-pre",
Expand Down
44 changes: 44 additions & 0 deletions cloudian_build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
#!/bin/sh -e

# Log in to quay.io
if [ -z $QUAY_IO_CREDENTIALS ]; then
echo Must set QUAY_IO_CREDENTIALS before running this script
exit 1
fi
USERNAME=$(echo $QUAY_IO_CREDENTIALS | cut -d: -f1)
PASSWORD=$(echo $QUAY_IO_CREDENTIALS | cut -d: -f2)
if echo "$QUAY_IO_CREDENTIALS" | grep -vq ":"; then
echo QUAY_IO_CREDENTIALS must be in the format username:password
exit 1
fi
echo $PASSWORD | docker login quay.io -u $USERNAME --password-stdin

cd $(dirname $0)

# Determine TAG for this build
REPO=quay.io/cloudian/grafana
TAG=$(git describe)

# Strip off Git commit for release build
if [ "$1" = "release" ]; then
TAG=$(echo $TAG | cut -d- -f1-2)
fi

# Don't include leading 'v' from the repository tag
if echo "$TAG" | grep -q "^v"; then
TAG=$(echo "$TAG" | cut -b2-)
fi

# Pulled from Makefile build-docker-full target
export TAG REPO
make build-docker-full-cloudian

# Push to quay.io if we're doing a release build
if [ "$1" = "release" ]; then
# Send to quay.io
docker push $REPO:$TAG

# Update the latest tag
docker tag $REPO:$TAG $REPO:latest
docker push $REPO:latest
fi
2 changes: 1 addition & 1 deletion conf/defaults.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1296,7 +1296,7 @@ alerting_rule_evaluation_results = -1
#################################### Unified Alerting ####################
[unified_alerting]
# Enable the Alerting sub-system and interface.
enabled =
enabled = true

# Comma-separated list of organization IDs for which to disable unified alerting. Only supported if unified alerting is enabled.
disabled_orgs =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
},
"id": 13,
"options": {
"content": "\n# Welcome to Grafana 7.4\n\nGrafana v7.4 is adds many new enhancements to visualizations, transformations, tracing, security, auditing & more. This dashboard highlights \nsome of the new visualization capabilities. \n\n[Read the what's new article](https://grafana.com/docs/grafana/latest/whatsnew/whats-new-in-v7-4/) | \n[Download](https://grafana.com/grafana/download/beta)",
"content": "\n# Welcome to Cloudian® HyperIQ 7.4\n\nGrafana v7.4 is adds many new enhancements to visualizations, transformations, tracing, security, auditing & more. This dashboard highlights \nsome of the new visualization capabilities. \n\n[Read the what's new article](https://grafana.com/docs/grafana/latest/whatsnew/whats-new-in-v7-4/) | \n[Download](https://grafana.com/grafana/download/beta)",
"mode": "markdown"
},
"pluginVersion": "7.4.0-beta1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"id": 13,
"options": {
"content": "\n# Welcome to Grafana 8.0\n\nGrafana v8.0 adds many visualizations and improvements to panel edit, tracing and security. This dashboard highlights \nsome of the new visualization capabilities. There are so many new visualizations and display options so be sure to scroll down\nto see everything. \n\n[Read the what's new article](https://grafana.com/docs/grafana/next/whatsnew/whats-new-in-v8-0/)   |  \n[Download](https://grafana.com/grafana/download/beta)   |  \n[Grafana Cloud now free with 50gb logs, 10K metric series](https://grafana.com/signup/cloud/connect-account?pg=play&plcmt=whatnew)",
"content": "\n# Welcome to Cloudian® HyperIQ 8.0\n\nGrafana v8.0 adds many visualizations and improvements to panel edit, tracing and security. This dashboard highlights \nsome of the new visualization capabilities. There are so many new visualizations and display options so be sure to scroll down\nto see everything. \n\n[Read the what's new article](https://grafana.com/docs/grafana/next/whatsnew/whats-new-in-v8-0/)   |  \n[Download](https://grafana.com/grafana/download/beta)   |  \n[Grafana Cloud now free with 50gb logs, 10K metric series](https://grafana.com/signup/cloud/connect-account?pg=play&plcmt=whatnew)",
"mode": "markdown"
},
"pluginVersion": "8.1.0-pre",
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/administration/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ weight: 40

# Administration

This section includes information for Grafana administrators, team administrators, and users performing administrative tasks:
This section includes information for HyperIQ administrators, team administrators, and users performing administrative tasks:

{{< section >}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ aliases:
- ../enterprise/query-caching/
- ../features/datasources/add-a-data-source/
- ../permissions/datasource_permissions/
description: Data source management information for Grafana administrators
description: Data source management information for HyperIQ administrators
labels:
products:
- enterprise
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ LBAC for data sources controls access to logs or metrics depending on the rules
This feature addresses two common challenges faced by Grafana users:

1. Having a high number of Grafana Cloud data sources.
LBAC for data sources lets Grafana administrators reduce the total number of data sources per instance from hundreds, to one.
LBAC for data sources lets HyperIQ administrators reduce the total number of data sources per instance from hundreds, to one.
1. Using the same dashboard across multiple teams.
LBAC for data sources lets Grafana Teams use the same dashboard with different access control rules.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ Grafana allows you to manage certain aspects of your user account, including you

You can also view important information about your account, such as the organizations and roles to which you are assigned and the Grafana sessions associated with your account.

## Change your Grafana password
## Change your HyperIQ password

You can change your Grafana password at any time.
You can change your HyperIQ password at any time.

{{< admonition type="note" >}}
If your Grafana instance uses an external authentication provider, then you might not be able to change your password in Grafana. Contact your Grafana administrator for more information.
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/as-code/infrastructure-as-code/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ The as-code tools and tutorials that follow show you what do to, to declarativel

## Grafana Terraform provider

Grafana administrators can manage dashboards, alerts and collectors, add synthetic monitoring probes and checks, manage identity and access, and more using the [Terraform provider for Grafana](https://registry.terraform.io/providers/grafana/grafana/latest).
HyperIQ administrators can manage dashboards, alerts and collectors, add synthetic monitoring probes and checks, manage identity and access, and more using the [Terraform provider for Grafana](https://registry.terraform.io/providers/grafana/grafana/latest).

The following example shows a Terraform configuration for creating a dashboard:

Expand Down
4 changes: 2 additions & 2 deletions docs/sources/setup-grafana/configure-grafana/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -1008,7 +1008,7 @@ Default is `15m` (15 minutes). The minimum supported duration is `5m` (5 minutes

#### `hidden_users`

This is a comma-separated list of usernames. Users specified here are hidden in the Grafana UI. They are still visible to Grafana administrators and to themselves.
This is a comma-separated list of usernames. Users specified here are hidden in the Grafana UI. They are still visible to HyperIQ administrators and to themselves.

<hr>

Expand Down Expand Up @@ -2555,7 +2555,7 @@ We do _not_ recommend using this option. For more information, refer to [Plugin

#### `plugin_admin_enabled`

Available to Grafana administrators only, enables installing, uninstalling, and updating plugins directly from the Grafana UI.
Available to HyperIQ administrators only, enables installing, uninstalling, and updating plugins directly from the Grafana UI.
Set to `true` by default.
Setting it to `false` hides the controls.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ Instead of encrypting all secrets with a single key, Grafana uses a set of keys

### Implicit breaking change

Envelope encryption introduces an implicit breaking change to versions of Grafana prior to v9.0, because it changes how secrets stored in the Grafana database are encrypted. Grafana administrators can upgrade to Grafana v9.0 with no action required from the database encryption perspective, but must be extremely careful if they need to roll an upgrade back to Grafana v8.5 or earlier because secrets created or modified after upgrading to Grafana v9.0 can’t be decrypted by previous versions.
Envelope encryption introduces an implicit breaking change to versions of Grafana prior to v9.0, because it changes how secrets stored in the Grafana database are encrypted. HyperIQ administrators can upgrade to Grafana v9.0 with no action required from the database encryption perspective, but must be extremely careful if they need to roll an upgrade back to Grafana v8.5 or earlier because secrets created or modified after upgrading to Grafana v9.0 can’t be decrypted by previous versions.

Grafana v8.5 implemented envelope encryption behind an optional feature toggle. Grafana administrators who need to downgrade to Grafana v8.5 can enable envelope encryption as a workaround by adding the feature toggle `envelopeEncryption` to the [Grafana configuration](../../configure-grafana/#feature_toggles).
Grafana v8.5 implemented envelope encryption behind an optional feature toggle. HyperIQ administrators who need to downgrade to Grafana v8.5 can enable envelope encryption as a workaround by adding the feature toggle `envelopeEncryption` to the [Grafana configuration](../../configure-grafana/#feature_toggles).

## Operational work

From the database encryption perspective, Grafana administrators can:
From the database encryption perspective, HyperIQ administrators can:

- [**Re-encrypt secrets**](#re-encrypt-secrets): re-encrypt secrets with envelope encryption and a fresh data key.
- [**Roll back secrets**](#roll-back-secrets): decrypt secrets encrypted with envelope encryption and re-encrypt them with legacy encryption.
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/shared/datasources/tempo-search-traceql.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ To access the **Search** query builder, use the following steps:
Using filters, you refine the data returned from the query by selecting **Service Name**, **Span Name**, **Status**, or **Duration**.
**Duration** represents span time, calculated by subtracting the end time from the start time of the span.

Grafana administrators can change the default filters using the Tempo data source configuration.
HyperIQ administrators can change the default filters using the Tempo data source configuration.
Filters can be limited by the operators.
The field type determines the available operators.
For example, **Span Name** and **Service Name** are string fields so the comparison operators are equals (`=`), not equal (`!=`), matches regular expressions (`=~`), or doesn't match regular expression (`!~`).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ refs:

# Grafana dashboard best practices

This section provides information about best practices for intermediate Grafana administrators and users about how to build and maintain Grafana dashboards.
This section provides information about best practices for intermediate HyperIQ administrators and users about how to build and maintain Grafana dashboards.

For more information about the different kinds of dashboards you can create, refer to [Grafana dashboards: A complete guide to all the different types you can build](https://grafana.com/blog/2022/06/06/grafana-dashboards-a-complete-guide-to-all-the-different-types-you-can-build/?pg=webinar-getting-started-with-grafana-dashboard-design-amer&plcmt=related-content-1).

Expand Down
8 changes: 0 additions & 8 deletions docs/sources/visualizations/simplified-exploration/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,6 @@ cards:
href: ./logs/
description: Visualize log volumes to easily detect anomalies or significant changes over time, without needing to compose LogQL queries.
height: 24
- title: Grafana Traces Drilldown
href: ./traces/
description: Use Rate, Errors, and Duration (RED) metrics derived from traces to investigate and understand errors and latency issues within complex distributed systems.
height: 24
- title: Grafana Profiles Drilldown
href: ./profiles/
description: View and analyze high-level service performance, identify problem processes for optimization, and diagnose issues to determine root causes.
height: 24
aliases:
- ../explore/simplified-exploration/ # /docs/grafana/next/explore/simplified-exploration/
---
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/whatsnew/whats-new-in-v10-0.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ weight: -37

# What’s new in Grafana v10.0

Welcome to Grafana 10.0! Read on to learn about changes to search and navigation, dashboards and visualizations, and security and authentication.
Welcome to Cloudian® HyperIQ 10.0! Read on to learn about changes to search and navigation, dashboards and visualizations, and security and authentication.

For even more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md). For the specific steps we recommend when you upgrade to v10.0, check out our [Upgrade Guide](../../upgrade-guide/upgrade-v10.0/).

Expand Down
2 changes: 1 addition & 1 deletion docs/sources/whatsnew/whats-new-in-v10-1.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ weight: -38

# What’s new in Grafana v10.1

Welcome to Grafana 10.1! Read on to learn about changes to dashboards and visualizations, data sources, security and authentication and more. We're particularly excited about a set of improvements to visualizing logs from [Loki](https://grafana.com/products/cloud/logs/) and other logging data sources in Explore mode, and our Flame graph panel, used to visualize profiling data from [Pyroscope](https://grafana.com/blog/2023/03/15/pyroscope-grafana-phlare-join-for-oss-continuous-profiling/?pg=oss-phlare&plcmt=top-promo-banner) and other continuous profiling data sources.
Welcome to Cloudian® HyperIQ 10.1! Read on to learn about changes to dashboards and visualizations, data sources, security and authentication and more. We're particularly excited about a set of improvements to visualizing logs from [Loki](https://grafana.com/products/cloud/logs/) and other logging data sources in Explore mode, and our Flame graph panel, used to visualize profiling data from [Pyroscope](https://grafana.com/blog/2023/03/15/pyroscope-grafana-phlare-join-for-oss-continuous-profiling/?pg=oss-phlare&plcmt=top-promo-banner) and other continuous profiling data sources.

For even more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md). For the specific steps we recommend when you upgrade to v10.1, check out our [Upgrade Guide](../../upgrade-guide/upgrade-v10.1/).

Expand Down
2 changes: 1 addition & 1 deletion docs/sources/whatsnew/whats-new-in-v10-2.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ weight: -39

# What’s new in Grafana v10.2

Welcome to Grafana 10.2! Read on to learn about changes to dashboards and visualizations, data sources, security and authentication, and more. We’re particularly excited about the addition of generative AI features for dashboards, a new kind of basic role, and improvements to visualization transformations.
Welcome to Cloudian® HyperIQ 10.2! Read on to learn about changes to dashboards and visualizations, data sources, security and authentication, and more. We’re particularly excited about the addition of generative AI features for dashboards, a new kind of basic role, and improvements to visualization transformations.

For even more detail about all the changes in this release, refer to the [changelog](https://github.com/grafana/grafana/blob/main/CHANGELOG.md). For the specific steps we recommend when you upgrade to v10.2, check out our [Upgrade Guide](https://grafana.com/docs/grafana/<GRAFANA_VERSION>/upgrade-guide/upgrade-v10.2/).

Expand Down
2 changes: 1 addition & 1 deletion docs/sources/whatsnew/whats-new-in-v10-3.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ weight: -40

# What’s new in Grafana v10.3

Welcome to Grafana 10.3! Read on to learn about changes to navigation, visualizations and transformations, alerting, profiling, and logs.
Welcome to Cloudian® HyperIQ 10.3! Read on to learn about changes to navigation, visualizations and transformations, alerting, profiling, and logs.

We've also included here features released in Grafana 10.2.3, as well as breaking changes from that release. Features that were included in the 10.2.3 release are marked with an asterisk.

Expand Down
Loading
Loading