Commit Graph

3621 Commits

Author SHA1 Message Date
Sriram
89eb74730e ReleaseNotes: Updated changelog and release notes for 8.3.7 (#46028) (#46029)
(cherry picked from commit 3ea6c8cf64)

Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
2022-03-01 14:31:08 +00:00
Grot (@grafanabot)
3a95cdd78e Update geomap.md (#43527) (#45268)
(cherry picked from commit d97e74d80f)

Co-authored-by: JJgitGit <JJgitGit@users.noreply.github.com>
2022-02-10 17:50:51 -05:00
Grot (@grafanabot)
2f9f74b221 Rework template docs and add examples (#43178) (#43179)
(cherry picked from commit 8206802f19)

Co-authored-by: David Parrott <stomp.box.yo@gmail.com>
2022-02-09 09:57:56 +01:00
Grot (@grafanabot)
4a29cf13f0 update snapshots server url (#44563) (#44566)
* update snapshots server url
* update all old references to snapshot.raintank.io

(cherry picked from commit 1e89fc157d)

Co-authored-by: Dan Cech <dcech@grafana.com>
2022-02-08 17:05:20 +01:00
Dimitris Sotirakis
883977bc3a [v8.3.x] Update changelog for 8.3.5 and 7.5.15 (#45078) (#45086)
* Update changelog for 8.3.5 and 7.5.15 (#45078)

(cherry picked from commit b2a8487684)

* Remove 8.4.0-beta1 additions
2022-02-08 16:29:54 +01:00
Dimitris Sotirakis
f42d0b9beb [v8.3.x] Sync security changes (#45067)
* "Release: Updated versions in package to 8.3.5"

* [v8.3.x] Fix for CVE-2022-21702 (#225)

Fix for CVE-2022-21702

* Update yarn.lock for 8.3.5

* resolve conflicts

(cherry picked from commit bb38cfcba4b4f824060ff385d858c63f50b72d74)

* csrf checks for v8.3.5 (#234)

* Fix lint

* Cherry pick e2e test server changes

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
Co-authored-by: Serge Zaitsev <serge.zaitsev@grafana.com>
2022-02-08 15:35:38 +01:00
achatterjee-grafana
0ac23b0446 Fix link to user API (#44930) 2022-02-05 18:46:05 +01:00
Grot (@grafanabot)
e38d8cd8af Library Elements API GET by name returns array (#44743) (#44751)
* Library Elements API GET by name returns array

Making a GET request to the Library Elements HTTP API `api/library-elements/name/:name` will return an **array** of Library Element objects, but the documentation says it will return a Library Element object.

Example cURL POST request:
`curl -X POST -H "Content-Type: application/json" -H "Authorization: Bearer XXXXXXXXXXX" -d @request.json "https://my.grafana.net/api/library-elements/"`

request.json
```json
{
  "model": {},
  "kind": 1,
  "name": "testing description3",
  "uid": "basic3",
  "id": 12345,
  "version": 2
}
```

Example cURL GET request:
`curl -X GET -H "Content-Type: application/json" -H "Authorization: Bearer XXXXXXXX" -d @request "https://my/api/library-elements/name/testing description3"`

Example response:
```json
{
    "result": [
        {
            . . .
        }
    ]
}
```

* Library Elements API fix bracket spacing

(cherry picked from commit 925333bfa4)

Co-authored-by: JM <justintmai@gmail.com>
2022-02-02 18:46:03 +01:00
Tania B
2bd51b506e add links between encryption docs (#42549) (#44705)
(cherry picked from commit b7e1f5f9ce)

Co-authored-by: Mitch Seaman <mjseaman@users.noreply.github.com>
2022-02-01 15:12:21 +02:00
Grot (@grafanabot)
b88f3a909e Add concept about envelope encryption (#41860) (#44703)
* Add concept about envelope-encryption.

* remove comma

* separate warning note into steps

* remove steps from warning note

* Fix lint

Co-authored-by: Mitch Seaman <mjseaman@users.noreply.github.com>
Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com>
(cherry picked from commit ed0f3100b3)

Co-authored-by: Ursula Kallio <73951760+osg-grafana@users.noreply.github.com>
2022-02-01 14:49:27 +02:00
Grot (@grafanabot)
8f7c031d1d Docs: Add section about limitations alerting in "Time range controls" (#44680) (#44682)
* Added section about syntaxes not supported by Grafana. Also updated missing image name.

* Fixed image name again.

(cherry picked from commit 133e34d52a)

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
2022-01-31 18:46:33 -05:00
Grot (@grafanabot)
30c7df22ee Docs: Added information about Prometheus write permission requirement. (#44616) (#44618)
* Added note.

* Fixed typo.

(cherry picked from commit d584a27055)

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
2022-01-28 20:22:32 -05:00
Grot (@grafanabot)
2c1a590752 fix typo (#44564) (#44567)
(cherry picked from commit 7b476c19c2)

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
2022-01-28 08:42:43 -05:00
Grot (@grafanabot)
872727e745 Chore: Remove unused AWS KMS provider's token setting (#44531) (#44548)
(cherry picked from commit 1a9c293984)

Co-authored-by: Tania B <yalyna.ts@gmail.com>
2022-01-27 16:30:57 +01:00
Grot (@grafanabot)
db1b31d542 docs: Fix URL for Github callback in OAuth. (#41122) (#44332)
(cherry picked from commit 5d0bc9e933)

Co-authored-by: Jason Walton <github@lucid.thedreaming.org>
2022-01-21 12:03:36 -05:00
Grot (@grafanabot)
64fc2ecb0e Docs: add API pages to HTTP API list (#42997) (#44328)
* add API pages to HTTP API list

* fix capitalization of page names

(cherry picked from commit 8a21385481)

Co-authored-by: JM <justintmai@gmail.com>
2022-01-21 10:31:55 -05:00
Grot (@grafanabot)
5bc1a0ad06 docs: Move password information on password smtp section (#42370) (#44229)
*What this PR does / why we need it:*

The password information is on [enabled section](https://grafana.com/docs/grafana/latest/administration/configuration/#enabled), I move it on [password section](https://grafana.com/docs/grafana/latest/administration/configuration/#password-1).

(cherry picked from commit f6b385f0ca)

Co-authored-by: kosssi <github@fafaru.com>
2022-01-19 14:29:05 -05:00
Gleb Goncharov
f63ec0f43d Fix WebSockets configuration for Nginx (#44148) 2022-01-19 15:47:01 +03:00
Dimitris Sotirakis
42bffe2310 [v8.3.x] Update changelog and lockfile for 8.3.4 (#44168)
* ReleaseNotes: Updated changelog and release notes for 8.3.4 (#218)

(cherry picked from commit d5a5360328)

Co-authored-by: grafanabot <bot@grafana.com>
(cherry picked from commit de38ed8d67985c2da189007d44eaa17769c772ab)
(cherry picked from commit c39413645f)

* "Release: Updated versions in package to 8.3.4" (#216)

(cherry picked from commit 39d66dcc8af875313c99beda2f46fb9c6d5443fb)
(cherry picked from commit 82a2acf00b)

* Update lockfile

(cherry picked from commit a551d74b11)

Co-authored-by: Grot (@grafanabot) <43478413+grafanabot@users.noreply.github.com>
2022-01-18 17:09:27 +01:00
Grot (@grafanabot)
5681f348c4 Plugins: Add notices to docs to prevent NPX commands from hanging (#44043) (#44119)
* docs(plugins): add notice about npm 7 flag to prevent commands from hanging

* Apply suggestions from code review

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
(cherry picked from commit e888a40531)

Co-authored-by: Jack Westbrook <jack.westbrook@gmail.com>
2022-01-17 15:47:27 +00:00
Grot (@grafanabot)
cbede52ef6 Fix issue link (#42891) (#44123)
(cherry picked from commit c4b345cfc4)

Co-authored-by: Gabi Davar <grizzly.nyo@gmail.com>
2022-01-17 15:44:25 +00:00
Grot (@grafanabot)
cea53ca70a Fixed broken links in documentation (#44044) (#44054)
* Fixed broken link

* Fixed broken contribute documentation link

* Consistent relative contribute-folder url

(cherry picked from commit bd8791aced)

Co-authored-by: ToTheMax <21971014+ToTheMax@users.noreply.github.com>
2022-01-14 10:49:45 -05:00
Grot (@grafanabot)
425b9f5bd4 Docs: clean up image renderer dependencies and add ones for CentOS 8 (#41862) (#43993)
* Docs: clean up image renderer dependencies and add ones for CentOS 8

* apply PR review feedback

(cherry picked from commit a9dfd3a487)

Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
2022-01-13 11:55:01 +01:00
Nate Walters
d4a1fad604 Chore: fix docs typo (#43980) 2022-01-12 22:03:32 -08:00
Grot (@grafanabot)
c7c7d6fe88 Alerting: [Docs] Clarifications regarding what's supported in alerting message templates (#43544) (#43924)
* Clarify docs for alerting templates

* Fix template cross-reference

* Add a single missing delimiter

* Update docs/sources/alerting/unified-alerting/message-templating/_index.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/alerting/unified-alerting/message-templating/_index.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/alerting/unified-alerting/message-templating/_index.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/alerting/unified-alerting/message-templating/_index.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Address various points of docs feedback

* Update docs/sources/alerting/unified-alerting/message-templating/_index.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/alerting/unified-alerting/message-templating/_index.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/alerting/unified-alerting/message-templating/_index.md

Co-authored-by: Yuriy Tseretyan <tceretian@gmail.com>

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
Co-authored-by: Yuriy Tseretyan <tceretian@gmail.com>
(cherry picked from commit 59bda131ec)

Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>
2022-01-11 14:39:08 -06:00
Isabella Siu
10fb21ff18 CloudMonitoring: separate out google auth docs (#43481) (#43907)
* CloudMonitoring: separate out google auth docs

* Apply suggestions from code review

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* docs team changes

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
(cherry picked from commit 5e7804f466)
2022-01-11 10:23:23 -05:00
Grot (@grafanabot)
f67d474844 Fix typo in contact-points documentation (#43883) (#43903)
Fixes a typo in contact-points documentation, `mesasges` => `messages`

(cherry picked from commit 58408f31ab)

Co-authored-by: Andreas Fitzek <andreas.fitzek@gmail.com>
2022-01-11 10:05:35 -05:00
Grot (@grafanabot)
040bdf4803 Fixed incorrect link to text panel page (#43757) (#43775)
"Text panel" was linking to the "alert list panel" page: (https://grafana.com/docs/grafana/latest/visualizations/alert-list-panel/). This change should map it to the correct page now (https://grafana.com/docs/grafana/latest/visualizations/text-panel/).

Co-authored-by: achatterjee-grafana <aparajita.chatterjee@grafana.com>
(cherry picked from commit faca526c16)

Co-authored-by: MaukWM <maukmul@gmail.com>
2022-01-06 15:38:19 -05:00
Guilherme Caulada
1b7450863a docs: aws marketplace license activation (#43466) (#43681)
* initial draft

* role creation prereq

* separate ecs and eks docs

* update ECS steps

* reword ecs instructions

* spacing

* remove spaces to make a hyperlink work

* added aws marketplace content

* update enterprise configuration

* add detail to deploy outside of aws

* improve outside of aws config

* minor addition

* update region syntax

* Update docs/sources/enterprise/license/_index.md

* typo

* Update EKS docs with detailed instructions

* Add task to setup ECS for high-availability

* Fix AWS_REGION environment variable

* final review and changes

* section landing page tweak

* Update docs/sources/enterprise/license/activate-aws-marketplace-license/about-ge-license-through-aws.md

Co-authored-by: Guilherme Caulada <guilherme.caulada@grafana.com>

* fixed links, changed db parameters to placeholder values

* copy edits

* copy updates

* Fix typos pointed out by codespell

* Fix prettier issue on EKS documentation

Co-authored-by: Mitchel Seaman <mitchel.seaman@gmail.com>
Co-authored-by: Mitch Seaman <mjseaman@users.noreply.github.com>
Co-authored-by: Guilherme Caulada <guilherme.caulada@grafana.com>
(cherry picked from commit 238345b62d)

Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com>
2022-01-05 12:34:54 -03:00
Grot (@grafanabot)
7426045ed4 Add note for Cloud users. (#43689) (#43691)
(cherry picked from commit a9ad7d3c03)

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
2022-01-04 17:48:41 -05:00
Grot (@grafanabot)
70a371fa11 [v8.3.x] Docs: Added note that alert notifications no longer include images (#43636)
* added note that notifications no longer include images. (#43635)

(cherry picked from commit 88bc47441f)

* Ran prettier to fix formatting.

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
Co-authored-by: achatterjee-grafana <aparajita.chatterjee@grafana.com>
2022-01-04 00:56:05 +01:00
Grot (@grafanabot)
0b12ef7d70 Chore: Update release notes index page with 8.3.3 (#43224) (#43231)
(cherry picked from commit df6765d805)

Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
2021-12-16 17:56:57 +01:00
Grot (@grafanabot)
0823902be1 Tempo: Add provisioning example to Tempo docs (#43049) (#43111)
* Add provisioning example to Tempo docs

* Update docs/sources/datasources/tempo.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
(cherry picked from commit d2c5dac76f)

Co-authored-by: Connor Lindsey <cblindsey3@gmail.com>
2021-12-14 17:03:36 +01:00
Grot (@grafanabot)
2683daf1fe Docs: Add CloudWatch Logs retry strategy timeout config (#42485) (#43107)
* Add section for the timeout

* Move and remove the table

* Change header level

(cherry picked from commit dc57bcd458)

Co-authored-by: Andrej Ocenas <mr.ocenas@gmail.com>
2021-12-14 16:39:13 +01:00
Grot (@grafanabot)
7a8a530f6e ReleaseNotes: Updated changelog and release notes for 8.3.3 (#43101) (#43105)
(cherry picked from commit 8869c830b0)
2021-12-14 16:20:38 +01:00
Marcus Efraimsson
ce66af2cbd chore(release-notes): add release notes for 8.2.3 and 7.5.12 (#42987) (#42992)
* chore(release-notes): add release notes for 8.2.3 and 7.5.12

* chore(release-notes): add release notes to the index

* chore(release-notes): add release notes to index and changelog

* chore(release-notes): add release notes to index and changelog

* chore(latest.json): bump

(cherry picked from commit fd48aee61e)

Co-authored-by: Timur Olzhabayev <timur.olzhabayev@grafana.com>
2021-12-10 13:30:44 -05:00
Grot (@grafanabot)
e804fb3dce Docs: Clarify relative time range overrides (#42930) (#42965)
* Docs: Clarify relative time range overrides

* Update docs/sources/dashboards/time-range-controls.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/panels/queries.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
(cherry picked from commit e6c24396da)

Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com>
2021-12-10 09:00:59 +01:00
achatterjee-grafana
434614483b fixed image link. (#42956) (#42959) 2021-12-09 18:06:37 -05:00
Grot (@grafanabot)
1994dbf27b fixed image links, also two broken relfrefs for alerting. (#42954) (#42955)
(cherry picked from commit d2073580be)

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
2021-12-09 17:07:46 -05:00
Will Browne
3e1d120d88 ReleaseNotes: Update 8.3.1 release notes (#42844)
* security: fix dir traversal issue

* Revert "security: fix dir traversal issue"

Meant to do PR.

This reverts commit 8af709a1e7.

* update release notes

Co-authored-by: Kyle Brandt <kyle@grafana.com>
2021-12-07 19:21:45 +02:00
Grot (@grafanabot)
7a1d6835c7 Alerting: add documentation about alertmanager contactpoint support (#42799) (#42808)
(cherry picked from commit e70cdb3f49)

Co-authored-by: Jean-Philippe Quéméner <JohnnyQQQQ@users.noreply.github.com>
2021-12-07 10:02:56 +01:00
Grot (@grafanabot)
52372f2912 Update service graph docs (#42604) (#42757)
* Update service graph docs

* Add link to agent configuration

(cherry picked from commit bf744698a1)

Co-authored-by: Connor Lindsey <cblindsey3@gmail.com>
2021-12-03 18:28:19 +01:00
Grot (@grafanabot)
14df12c53a recorded queries - add recorded queries to the enterprise configuration (#42613) (#42679)
* add recorded queries to the enterprise configuration

* change name to default_

(cherry picked from commit e79fe8e84e)

Co-authored-by: Travis Patterson <travis.patterson@grafana.com>
2021-12-02 14:49:43 -05:00
Grot (@grafanabot)
b6275ca8e0 Docs: Dedicated section for Grouping in Alerting (#42641) (#42670)
* Docs: Dedicated section for Grouping in Alerting

* Update docs/sources/alerting/unified-alerting/notification-policies.md

Co-authored-by: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>

* Update docs/sources/alerting/unified-alerting/notification-policies.md

Co-authored-by: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>

* Update docs/sources/alerting/unified-alerting/notification-policies.md

Co-authored-by: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>

* Update docs/sources/alerting/unified-alerting/notification-policies.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/alerting/unified-alerting/notification-policies.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Review suggestions

Co-authored-by: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>
Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
(cherry picked from commit 67461086de)

Co-authored-by: gotjosh <josue@grafana.com>
2021-12-02 16:31:01 +00:00
Grot (@grafanabot)
e9432fffd7 ReleaseNotes: Updated changelog and release notes for 8.2.6 (#42655) (#42673)
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>
(cherry picked from commit e94adfd2c8)
2021-12-02 17:23:29 +01:00
Grot (@grafanabot)
57c4d4e69b Update aws-authentication.md (#42558) (#42650)
(cherry picked from commit 2ead937a26)

Co-authored-by: Robby Milo <robby.milo@grafana.com>
2021-12-02 09:08:21 -05:00
Grot (@grafanabot)
e9b947ab66 Docs alerting doc updates (#42262) (#42614)
* Replaced "Grafana 8 alerting" with "Grafana alerting". Added support matrix for Grafana alerting.

* Few more changes and added deprecation notice to legacy alerting landing page.

* Added more content from Yuri's PR.

* Ran prettier.

* Added code review changes.

* One more change.

* Fixed linked texts.

(cherry picked from commit ae655f2675)

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
2021-12-01 18:08:33 -05:00
Grot (@grafanabot)
6722e8f37b Docs: Grafana 8.3 Release Docs - Minor updates (#42609) (#42610)
* missing panel quick descriptions

* Panel rel ref fix

* AWS Cloudwatch Metrics to Whats New

(cherry picked from commit 248c71c903)

Co-authored-by: Petros Kolyvas <code@petros.io>
2021-12-01 21:22:38 +01:00
Grot (@grafanabot)
dc75d8892e Docs: What's new 8.3 with additions and image links (#42551) (#42599)
* OSS images

* Enterprise images

* Adds the link to the what's new page

* Updated Alerting header style

* Prettier fix

* Update docs/sources/whatsnew/whats-new-in-v8-3.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/whatsnew/whats-new-in-v8-3.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/whatsnew/whats-new-in-v8-3.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
(cherry picked from commit 41917c1473)

Co-authored-by: Petros Kolyvas <code@petros.io>
2021-12-01 12:45:45 -04:00
Grot (@grafanabot)
6119a82cb2 Docs: New documentation for the Grafana 8.3 Candlestick panel (#42491) (#42597)
* Initial scaffolding

* intro sentence

* Option scaffolding

* More complete candlestick documentation

* Add candlestick to visualization list

* Clarifying the opening sentence.

* Prettier fix for Candlestick

* Update docs/sources/visualizations/candlestick.md

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>

* Update docs/sources/visualizations/candlestick.md

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>

* Updated to clarify hollow candlestick behaviour

* Prettier run manually

* Update docs/sources/visualizations/candlestick.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/visualizations/candlestick.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/visualizations/candlestick.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

* Update docs/sources/visualizations/candlestick.md

Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>

Co-authored-by: Leon Sorokin <leeoniya@gmail.com>
Co-authored-by: achatterjee-grafana <70489351+achatterjee-grafana@users.noreply.github.com>
(cherry picked from commit 7b1aee5220)

Co-authored-by: Petros Kolyvas <code@petros.io>
2021-12-01 17:30:18 +01:00