Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(alertmanager): add PVC for silences persistance #138

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all 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
26 changes: 20 additions & 6 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ The following requirements are needed by this module:

The following providers are used by this module:

- [[provider_kubernetes]] <<provider_kubernetes,kubernetes>> (>= 2)

- [[provider_random]] <<provider_random,random>> (>= 3)

- [[provider_utils]] <<provider_utils,utils>> (>= 1)

- [[provider_argocd]] <<provider_argocd,argocd>> (>= 6)

- [[provider_kubernetes]] <<provider_kubernetes,kubernetes>> (>= 2)

- [[provider_utils]] <<provider_utils,utils>> (>= 1)

- [[provider_null]] <<provider_null,null>> (>= 3)

=== Resources
Expand Down Expand Up @@ -120,7 +120,7 @@ Description: Override of target revision of the application chart.

Type: `string`

Default: `"v13.0.0"`
Default: `"v13.0.1"`

==== [[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>

Expand Down Expand Up @@ -322,6 +322,14 @@ Type: `number`

Default: `30`

==== [[input_alertmanager_storage_size]] <<input_alertmanager_storage_size,alertmanager_storage_size>>

Description: PVC size for Alertmanager data.

Type: `string`

Default: `"10Gi"`

=== Outputs

The following outputs are exported:
Expand Down Expand Up @@ -425,7 +433,7 @@ Description: The admin password for Grafana.
|[[input_target_revision]] <<input_target_revision,target_revision>>
|Override of target revision of the application chart.
|`string`
|`"v13.0.0"`
|`"v13.0.1"`
|no

|[[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>
Expand Down Expand Up @@ -614,6 +622,12 @@ object({
|`30`
|no

|[[input_alertmanager_storage_size]] <<input_alertmanager_storage_size,alertmanager_storage_size>>
|PVC size for Alertmanager data.
|`string`
|`"10Gi"`
|no

|===

= Outputs
Expand Down
18 changes: 16 additions & 2 deletions aks/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ Description: Override of target revision of the application chart.

Type: `string`

Default: `"v13.0.0"`
Default: `"v13.0.1"`

==== [[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>

Expand Down Expand Up @@ -320,6 +320,14 @@ Type: `number`

Default: `30`

==== [[input_alertmanager_storage_size]] <<input_alertmanager_storage_size,alertmanager_storage_size>>

Description: PVC size for Alertmanager data.

Type: `string`

Default: `"10Gi"`

=== Outputs

The following outputs are exported:
Expand Down Expand Up @@ -437,7 +445,7 @@ object({
|[[input_target_revision]] <<input_target_revision,target_revision>>
|Override of target revision of the application chart.
|`string`
|`"v13.0.0"`
|`"v13.0.1"`
|no

|[[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>
Expand Down Expand Up @@ -626,6 +634,12 @@ object({
|`30`
|no

|[[input_alertmanager_storage_size]] <<input_alertmanager_storage_size,alertmanager_storage_size>>
|PVC size for Alertmanager data.
|`string`
|`"10Gi"`
|no

|===

= Outputs
Expand Down
18 changes: 16 additions & 2 deletions eks/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ Description: Override of target revision of the application chart.

Type: `string`

Default: `"v13.0.0"`
Default: `"v13.0.1"`

==== [[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>

Expand Down Expand Up @@ -320,6 +320,14 @@ Type: `number`

Default: `30`

==== [[input_alertmanager_storage_size]] <<input_alertmanager_storage_size,alertmanager_storage_size>>

Description: PVC size for Alertmanager data.

Type: `string`

Default: `"10Gi"`

=== Outputs

The following outputs are exported:
Expand Down Expand Up @@ -433,7 +441,7 @@ object({
|[[input_target_revision]] <<input_target_revision,target_revision>>
|Override of target revision of the application chart.
|`string`
|`"v13.0.0"`
|`"v13.0.1"`
|no

|[[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>
Expand Down Expand Up @@ -622,6 +630,12 @@ object({
|`30`
|no

|[[input_alertmanager_storage_size]] <<input_alertmanager_storage_size,alertmanager_storage_size>>
|PVC size for Alertmanager data.
|`string`
|`"10Gi"`
|no

|===

= Outputs
Expand Down
18 changes: 16 additions & 2 deletions kind/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Description: Override of target revision of the application chart.

Type: `string`

Default: `"v13.0.0"`
Default: `"v13.0.1"`

==== [[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>

Expand Down Expand Up @@ -301,6 +301,14 @@ Type: `number`

Default: `30`

==== [[input_alertmanager_storage_size]] <<input_alertmanager_storage_size,alertmanager_storage_size>>

Description: PVC size for Alertmanager data.

Type: `string`

Default: `"10Gi"`

=== Outputs

The following outputs are exported:
Expand Down Expand Up @@ -396,7 +404,7 @@ object({
|[[input_target_revision]] <<input_target_revision,target_revision>>
|Override of target revision of the application chart.
|`string`
|`"v13.0.0"`
|`"v13.0.1"`
|no

|[[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>
Expand Down Expand Up @@ -585,6 +593,12 @@ object({
|`30`
|no

|[[input_alertmanager_storage_size]] <<input_alertmanager_storage_size,alertmanager_storage_size>>
|PVC size for Alertmanager data.
|`string`
|`"10Gi"`
|no

|===

= Outputs
Expand Down
12 changes: 12 additions & 0 deletions locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,18 @@ locals {
requests = { for k, v in var.resources.alertmanager.requests : k => v if v != null }
limits = { for k, v in var.resources.alertmanager.limits : k => v if v != null }
}
storage = {
volumeClaimTemplate = {
spec = {
accessModes = ["ReadWriteOnce"]
resources = {
requests = {
storage = var.alertmanager_storage_size
}
}
}
}
}
}
ingress = {
enabled = true
Expand Down
18 changes: 16 additions & 2 deletions sks/README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ Description: Override of target revision of the application chart.

Type: `string`

Default: `"v13.0.0"`
Default: `"v13.0.1"`

==== [[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>

Expand Down Expand Up @@ -442,6 +442,14 @@ Type: `number`

Default: `30`

==== [[input_alertmanager_storage_size]] <<input_alertmanager_storage_size,alertmanager_storage_size>>

Description: PVC size for Alertmanager data.

Type: `string`

Default: `"10Gi"`

=== Outputs

The following outputs are exported:
Expand Down Expand Up @@ -542,7 +550,7 @@ object({
|[[input_target_revision]] <<input_target_revision,target_revision>>
|Override of target revision of the application chart.
|`string`
|`"v13.0.0"`
|`"v13.0.1"`
|no

|[[input_cluster_issuer]] <<input_cluster_issuer,cluster_issuer>>
Expand Down Expand Up @@ -731,6 +739,12 @@ object({
|`30`
|no

|[[input_alertmanager_storage_size]] <<input_alertmanager_storage_size,alertmanager_storage_size>>
|PVC size for Alertmanager data.
|`string`
|`"10Gi"`
|no

|===

= Outputs
Expand Down
6 changes: 6 additions & 0 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -215,3 +215,9 @@ variable "dataproxy_timeout" {
type = number
default = 30
}

variable "alertmanager_storage_size" {
description = "PVC size for Alertmanager data."
type = string
default = "10Gi"
}