From b2b4e8f68de3a842a670ad284f005fbbf7dae79e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Bedi?= Date: Thu, 4 Jan 2024 11:28:00 +0100 Subject: [PATCH] MySQL: Update documentation around timezone (#79213) * MySQL: Update documentation around timezone * Update docs/sources/datasources/mysql/_index.md Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com> * Update formatting * see -> refer to --------- Co-authored-by: lwandz13 <126723338+lwandz13@users.noreply.github.com> --- docs/sources/datasources/mysql/_index.md | 2 +- .../mysql/configuration/ConfigurationEditor.tsx | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/sources/datasources/mysql/_index.md b/docs/sources/datasources/mysql/_index.md index ae6e6eefdba..9319d93b68d 100644 --- a/docs/sources/datasources/mysql/_index.md +++ b/docs/sources/datasources/mysql/_index.md @@ -48,7 +48,7 @@ Administrators can also [configure the data source via YAML](#provision-the-data | **Database** | Name of your MySQL database. | | **User** | Database user's login/username | | **Password** | Database user's password | -| **Session Timezone** | Specifies the time zone used in the database session, such as `Europe/Berlin` or `+02:00`. Required if the timezone of the database (or the host of the database) is set to something other than UTC. Set the value used in the session with `SET time_zone='...'`. If you leave this field empty, then the time zone is not updated. For more information, refer to the [MySQL documentation](https://dev.mysql.com/doc/en/time-zone-support.html). | +| **Session Timezone** | Specifies the timezone used in the database session, such as `Europe/Berlin` or `+02:00`. Required if the timezone of the database (or the host of the database) is set to something other than UTC. Set this to `+00:00` so Grafana can handle times properly. Set the value used in the session with `SET time_zone='...'`. If you leave this field empty, the timezone will not be updated. For more information, refer to [MySQL Server Time Zone Support](https://dev.mysql.com/doc/en/time-zone-support.html). | | **Max open** | The maximum number of open connections to the database, default `100` (Grafana v5.4+). | | **Max idle** | The maximum number of connections in the idle connection pool, default `100` (Grafana v5.4+). | | **Auto (max idle)** | Toggle to set the maximum number of idle connections to the number of maximum open connections (available in Grafana v9.5.1+). Default is `true`. | diff --git a/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx b/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx index 055dc88e276..6bd2640cec3 100644 --- a/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx +++ b/public/app/plugins/datasource/mysql/configuration/ConfigurationEditor.tsx @@ -177,11 +177,12 @@ export const ConfigurationEditor = (props: DataSourcePluginOptionsEditorProps - Specify the time zone used in the database session, e.g. Europe/Berlin or - +02:00. This is necessary, if the timezone of the database (or the host of the - database) is set to something other than UTC. The value is set in the session with - SET time_zone='...'. If you leave this field empty, the timezone is not - updated. You can find more information in the MySQL documentation. + Specify the timezone used in the database session, such as Europe/Berlin or + +02:00. Required if the timezone of the database (or the host of the database) is + set to something other than UTC. Set this to +00:00 so Grafana can handle times + properly. Set the value used in the session with SET time_zone='...'. If + you leave this field empty, the timezone will not be updated. You can find more information in + the MySQL documentation. } >