Skip to content
Merged
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
2 changes: 1 addition & 1 deletion k8s/helmfile/env/local/api.values.yaml.gotmpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
image:
tag: 8x.13.0
tag: 8x.14.0

ingress:
tls: null
Expand Down
5 changes: 4 additions & 1 deletion k8s/helmfile/env/production/api.values.yaml.gotmpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
image:
tag: 8x.13.0
tag: 8x.14.0

replicaCount:
web: 1
Expand Down Expand Up @@ -43,6 +43,9 @@ ingress:
{{- end }}

wbstack:
summaryCreationRateRanges:
- 'PT24H'
- 'P30D'
subdomainSuffix: {{ .Values.wbstack.subdomainSuffix }}
uiurl: {{ .Values.wbstack.uiurl }}
wikiDbProvisionVersion: mw1.39-wbs1
Expand Down
2 changes: 1 addition & 1 deletion k8s/helmfile/env/staging/api.values.yaml.gotmpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
image:
tag: 8x.13.0
tag: 8x.14.0

ingress:
tls:
Expand Down
2 changes: 1 addition & 1 deletion k8s/helmfile/helmfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ releases:

- name: api
chart: wbstack/api
version: 0.21.0
version: 0.22.0
namespace: default
<<: *default_release

Expand Down
15 changes: 15 additions & 0 deletions tf/env/production/monitoring.tf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,21 @@ module "production-monitoring" {
environment = "production"
cluster_name = local.production_cluster_name
monitoring_email_group_name = google_monitoring_notification_channel.monitoring_email_group.name
platform_summary_metrics = toset([
"active",
"total",
"deleted",
"inactive",
"empty",
"total_non_deleted_users",
"total_non_deleted_active_users",
"total_non_deleted_pages",
"total_non_deleted_edits",
"wikis_created_PT24H",
"wikis_created_P30D",
"users_created_PT24H",
"users_created_P30D",
])
}

resource "google_logging_metric" "production-site-request-count" {
Expand Down
827 changes: 424 additions & 403 deletions tf/env/production/platform-summary-dashboard.tf

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions tf/env/staging/monitoring.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,19 @@ module "staging-monitoring" {
cluster_name = local.staging_cluster_name
environment = "staging"
monitoring_email_group_name = google_monitoring_notification_channel.monitoring_email_group.name
platform_summary_metrics = toset([
"active",
"total",
"deleted",
"inactive",
"empty",
"total_non_deleted_users",
"total_non_deleted_active_users",
"total_non_deleted_pages",
"total_non_deleted_edits",
"wikis_created_PT24H",
"wikis_created_P30D",
"users_created_PT24H",
"users_created_P30D",
])
}
Loading