-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: add monitoring resources (#714)
* feat: add monitoring resources * update permission comment, update metadata.name for consistency with other permissions
- Loading branch information
1 parent
e65b450
commit 14964df
Showing
7 changed files
with
380 additions
and
172 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
23 changes: 23 additions & 0 deletions
23
solutions/core-landing-zone/lz-folder/audits/logging-project/monitoring/metrics-scope.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| # Copyright 2020 Google LLC | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| ######### | ||
| # add scope to monitor metrics in 'management-project-id' from 'logging-project-id' | ||
| apiVersion: monitoring.cnrm.cloud.google.com/v1beta1 | ||
| kind: MonitoringMonitoredProject | ||
| metadata: | ||
| # name needs to be the project ID of the project to be monitored | ||
| name: management-project-id # kpt-set: ${management-project-id} | ||
| namespace: logging | ||
| spec: | ||
| metricsScope: location/global/metricsScopes/logging-project-id # kpt-set: location/global/metricsScopes/${logging-project-id} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
solutions/core-landing-zone/lz-folder/audits/logging-project/services.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| # Copyright 2021 Google LLC | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| ######### | ||
| # Logging API | ||
| apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 | ||
| kind: Service | ||
| metadata: | ||
| name: logging-project-id-logging # kpt-set: ${logging-project-id}-logging | ||
| namespace: projects | ||
| annotations: | ||
| cnrm.cloud.google.com/disable-on-destroy: "false" | ||
| config.kubernetes.io/depends-on: resourcemanager.cnrm.cloud.google.com/namespaces/projects/Project/logging-project-id # kpt-set: resourcemanager.cnrm.cloud.google.com/namespaces/projects/Project/${logging-project-id} | ||
| spec: | ||
| resourceID: logging.googleapis.com | ||
| projectRef: | ||
| external: logging-project-id # kpt-set: ${logging-project-id} | ||
| --- | ||
| # Monitoring API | ||
| apiVersion: serviceusage.cnrm.cloud.google.com/v1beta1 | ||
| kind: Service | ||
| metadata: | ||
| name: logging-project-id-monitoring # kpt-set: ${logging-project-id}-monitoring | ||
| namespace: projects | ||
| annotations: | ||
| cnrm.cloud.google.com/disable-on-destroy: "false" | ||
| config.kubernetes.io/depends-on: resourcemanager.cnrm.cloud.google.com/namespaces/projects/Project/logging-project-id # kpt-set: resourcemanager.cnrm.cloud.google.com/namespaces/projects/Project/${logging-project-id} | ||
| spec: | ||
| resourceID: monitoring.googleapis.com | ||
| projectRef: | ||
| external: logging-project-id # kpt-set: ${logging-project-id} |
81 changes: 81 additions & 0 deletions
81
solutions/core-landing-zone/namespaces/config-management-monitoring.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| # Copyright 2021 Google LLC | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| ######### | ||
| # permissions and accounts required to enable Config Sync monitoring using Workload Identity | ||
| # the k8s 'config-management-monitoring/default' service account also needs to be annotated manually | ||
| # WARNING: once annotated, billable metrics will be generated | ||
| # https://cloud.google.com/anthos-config-management/docs/how-to/monitor-config-sync-cloud-monitoring | ||
| ######### | ||
| # GCP SA | ||
| # AC-3(7), AC-3, AC-16(2) - This service account possesses limited privileges(permissions) and is restricted to performing only the necessary operations for resources within the designated namespace. The service account is associated with the namespace and is assigned roles as required. | ||
| apiVersion: iam.cnrm.cloud.google.com/v1beta1 | ||
| kind: IAMServiceAccount | ||
| metadata: | ||
| name: config-mgmt-mon-default-sa | ||
| namespace: config-control # kpt-set: ${management-namespace} | ||
| annotations: | ||
| cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} | ||
| cnrm.cloud.google.com/ignore-clusterless: "true" | ||
| spec: | ||
| # AC-3(7), AC-3, AC-16(2) | ||
| displayName: config-mgmt-mon-default-sa | ||
| --- | ||
| # Grant GCP role Metrics Writer to config-mgmt-mon-default-sa on Management Project | ||
| apiVersion: iam.cnrm.cloud.google.com/v1beta1 | ||
| kind: IAMPolicyMember | ||
| metadata: | ||
| name: config-mgmt-mon-default-sa-metric-writer-permissions | ||
| namespace: config-control # kpt-set: ${management-namespace} | ||
| annotations: | ||
| cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} | ||
| cnrm.cloud.google.com/ignore-clusterless: "true" | ||
| spec: | ||
| resourceRef: | ||
| apiVersion: resourcemanager.cnrm.cloud.google.com/v1beta1 | ||
| kind: Project | ||
| external: management-project-id # kpt-set: ${management-project-id} | ||
| # AC-3(7), AC-3, AC-16(2) | ||
| role: roles/monitoring.metricWriter | ||
| member: "serviceAccount:config-mgmt-mon-default-sa@management-project-id.iam.gserviceaccount.com" # kpt-set: serviceAccount:config-mgmt-mon-default-sa@${management-project-id}.iam.gserviceaccount.com | ||
| --- | ||
| # K8S SA granted workload identity user | ||
| apiVersion: iam.cnrm.cloud.google.com/v1beta1 | ||
| kind: IAMPartialPolicy | ||
| metadata: | ||
| name: config-mgmt-mon-default-sa-workload-identity-binding | ||
| namespace: config-control # kpt-set: ${management-namespace} | ||
| annotations: | ||
| cnrm.cloud.google.com/project-id: management-project-id # kpt-set: ${management-project-id} | ||
| cnrm.cloud.google.com/ignore-clusterless: "true" | ||
| spec: | ||
| resourceRef: | ||
| name: config-mgmt-mon-default-sa | ||
| apiVersion: iam.cnrm.cloud.google.com/v1beta1 | ||
| kind: IAMServiceAccount | ||
| # AC-3(7), AC-3, AC-16(2) | ||
| bindings: | ||
| - role: roles/iam.workloadIdentityUser | ||
| members: | ||
| - member: serviceAccount:management-project-id.svc.id.goog[config-management-monitoring/default] # kpt-set: serviceAccount:${management-project-id}.svc.id.goog[config-management-monitoring/default] | ||
| --- | ||
| # Link GCP SA to K8S namespace | ||
| apiVersion: core.cnrm.cloud.google.com/v1beta1 | ||
| kind: ConfigConnectorContext | ||
| metadata: | ||
| name: configconnectorcontext.core.cnrm.cloud.google.com | ||
| namespace: config-management-monitoring | ||
| annotations: | ||
| cnrm.cloud.google.com/ignore-clusterless: "true" | ||
| spec: | ||
| googleServiceAccount: config-mgmt-mon-default-sa@management-project-id.iam.gserviceaccount.com # kpt-set: config-mgmt-mon-default-sa@${management-project-id}.iam.gserviceaccount.com |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.