aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2024-10-05 18:11:59 +0200
committerTrygve Laugstøl <trygvis@inamo.no>2024-10-05 18:11:59 +0200
commitca74ec83be53fc5a0ab189f68fab1ff81a752599 (patch)
treeaf3370aa2e737b5fe13451bedb4ca7c1404b5681
parentbe60351ff694b7e2d110ef475937a614f2007bac (diff)
downloadinfra-ca74ec83be53fc5a0ab189f68fab1ff81a752599.tar.gz
infra-ca74ec83be53fc5a0ab189f68fab1ff81a752599.tar.bz2
infra-ca74ec83be53fc5a0ab189f68fab1ff81a752599.tar.xz
infra-ca74ec83be53fc5a0ab189f68fab1ff81a752599.zip
Upgrading grafana
-rw-r--r--terraform/hash-grafana/.terraform.lock.hcl34
-rw-r--r--terraform/hash-grafana/grafana.tf4
-rw-r--r--terraform/hash-grafana/main.tf2
3 files changed, 20 insertions, 20 deletions
diff --git a/terraform/hash-grafana/.terraform.lock.hcl b/terraform/hash-grafana/.terraform.lock.hcl
index 4362198..3242795 100644
--- a/terraform/hash-grafana/.terraform.lock.hcl
+++ b/terraform/hash-grafana/.terraform.lock.hcl
@@ -43,24 +43,24 @@ provider "registry.terraform.io/hashicorp/random" {
}
provider "registry.terraform.io/kreuzwerker/docker" {
- version = "2.24.0"
- constraints = "2.24.0"
+ version = "3.0.2"
+ constraints = "3.0.2"
hashes = [
- "h1:1z0/qA77T3PS/1m4vRO8UgWjHjk5/v+f3JfGbMyzX18=",
- "zh:181fefd55c8eb75efe9815c43fdd76422b57951ef53b5d5f19273a00fdf0e2e2",
- "zh:2ec84e029d169f188be2addf7f45c2555f226f67d4b6fb66c1749ed5b2c4a76a",
- "zh:6f5cf945148485f57b919d31a30f1a5a93d45f4e8edfdb0b80b22258d51795d8",
- "zh:8d00c2c459a48453f52a00a8d1ffdb7bcf72fe4b3b09ffcfd52218c4646fa7fa",
- "zh:9bd6e06601e0a972b9ce01150e32e76b76b4caf1d9798daf4cf16d06e2a8d4a3",
- "zh:af72591132dc8cd338f293e458403851e6b8a6ac4c4d25a3268940f9763df7aa",
- "zh:c4a47c5c7ad2ff1fc5212e69c5ef837a127346264e46ce7b5d13362545e4aa70",
- "zh:c6d68f33efcd3372331ed0d58ec49e8b01ddc132934b14d2d45977076950e4b3",
- "zh:db228855ae7235095d367f3597719747e5be0dd9ce2206ea02062560b518c08a",
- "zh:e8d6ce89642925f2e813d0b829bd5562582de37eaa39351e231ab474383e703a",
- "zh:ec83d8c86a918d25eb824cc99f98924ef8949eb69aa40cb5ff2db24369e52d9c",
- "zh:ee0032d3d86adeeca7fdd4922bb8db87dbb5cd0093c054ff8efe2260de0b624c",
- "zh:f033b70f342f32eeb98c213e6fc7098d7afd22b3146a5cb6173c128b0e86d732",
- "zh:f1bc3a2c4f152f8adc9a1f9c852496232ef31073b149945756c13bc9688cf08b",
+ "h1:cT2ccWOtlfKYBUE60/v2/4Q6Stk1KYTNnhxSck+VPlU=",
+ "zh:15b0a2b2b563d8d40f62f83057d91acb02cd0096f207488d8b4298a59203d64f",
+ "zh:23d919de139f7cd5ebfd2ff1b94e6d9913f0977fcfc2ca02e1573be53e269f95",
+ "zh:38081b3fe317c7e9555b2aaad325ad3fa516a886d2dfa8605ae6a809c1072138",
+ "zh:4a9c5065b178082f79ad8160243369c185214d874ff5048556d48d3edd03c4da",
+ "zh:5438ef6afe057945f28bce43d76c4401254073de01a774760169ac1058830ac2",
+ "zh:60b7fadc287166e5c9873dfe53a7976d98244979e0ab66428ea0dea1ebf33e06",
+ "zh:61c5ec1cb94e4c4a4fb1e4a24576d5f39a955f09afb17dab982de62b70a9bdd1",
+ "zh:a38fe9016ace5f911ab00c88e64b156ebbbbfb72a51a44da3c13d442cd214710",
+ "zh:c2c4d2b1fd9ebb291c57f524b3bf9d0994ff3e815c0cd9c9bcb87166dc687005",
+ "zh:d567bb8ce483ab2cf0602e07eae57027a1a53994aba470fa76095912a505533d",
+ "zh:e83bf05ab6a19dd8c43547ce9a8a511f8c331a124d11ac64687c764ab9d5a792",
+ "zh:e90c934b5cd65516fbcc454c89a150bfa726e7cf1fe749790c7480bbeb19d387",
+ "zh:f05f167d2eaf913045d8e7b88c13757e3cf595dd5cd333057fdafc7c4b7fed62",
+ "zh:fcc9c1cea5ce85e8bcb593862e699a881bd36dffd29e2e367f82d15368659c3d",
]
}
diff --git a/terraform/hash-grafana/grafana.tf b/terraform/hash-grafana/grafana.tf
index 2c0f719..b425e72 100644
--- a/terraform/hash-grafana/grafana.tf
+++ b/terraform/hash-grafana/grafana.tf
@@ -1,5 +1,5 @@
resource "docker_image" "grafana" {
- name = "grafana/grafana-oss:10.1.5"
+ name = "grafana/grafana-oss:11.2.2"
}
resource "docker_volume" "grafana" {
@@ -38,7 +38,6 @@ resource "docker_container" "grafana" {
env = [
"GF_DATABASE_TYPE=postgres",
- # "GF_DATABASE_HOST=[fdf3:aad9:a885:b3a::1]",
"GF_DATABASE_HOST=knot.dn42.trygvis.io",
"GF_DATABASE_DATABASE=${postgresql_database.grafana.name}",
"GF_DATABASE_USER=${postgresql_role.grafana.name}",
@@ -48,5 +47,6 @@ resource "docker_container" "grafana" {
volumes {
volume_name = docker_volume.grafana.name
container_path = "/var/lib/grafana"
+ read_only = false
}
}
diff --git a/terraform/hash-grafana/main.tf b/terraform/hash-grafana/main.tf
index fb7c03a..043b778 100644
--- a/terraform/hash-grafana/main.tf
+++ b/terraform/hash-grafana/main.tf
@@ -2,7 +2,7 @@ terraform {
required_providers {
docker = {
source = "kreuzwerker/docker"
- version = "2.24.0"
+ version = "3.0.2"
}
postgresql = {
source = "cyrilgdn/postgresql"