From f11275a82c976c18f0807e9b31a74c63891a8554 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Thu, 6 Dec 2018 11:58:06 +0200 Subject: [PATCH 01/46] Fixed a couple of lines with mismatched indentation. --- monitoring/prometheus.yaml | 552 +++++++++---------------------------- 1 file changed, 126 insertions(+), 426 deletions(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index 67506e2..2f0c647 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -37,8 +37,7 @@ spec: ## image: repository: prom/alertmanager - #tag: v0.15.0 - tag: v0.15.2 + tag: v0.15.3 pullPolicy: IfNotPresent ## Additional alertmanager container arguments ## @@ -59,6 +58,21 @@ spec: ## to NOT generate a ConfigMap resource ## configMapOverrideName: "" + pagerduty: + ## If true, PagerDuty will be enabled for Alertmanager + ## + enabled: true + ## The sealed PagerDuty Service Key (sealed with Bitnami's SealedSecret) + servicekey: "AgAdqruztyqLNjqgyNlKmR9SrdeX49+/ujHMIYFC9n1yCRxS28uxsiXXQBoXBuMA8oaKctAiavFEWviFtNdcmvvnrfVVTjMOZCQMpdKXSBYjwOyMg+bLFoEdjcgJoy+OSFLLnZ4Bx72rPIycwF4jiz9+eznTCvt+W7u4H/Jh54sc9c3va8z9KSBNdL2poOphjLVqgkmegP5crSHhwA12X5EEsFhC1xFZd1cPMfLpxNThuCiL9H77nzk/m9bgQiyMcpBypaiElZHPNxlgDtvu+av/27y3/XscCPtGb35qroU9XhdNsr5Js2Fs/GG+SX3zb6EdEa2DnbaVNSYTJGXj2iEc0c2VdMCr8+xIa+PmH4wY9E+lxVZS6cE0TjBF7Yl+8+zCZ6Q5Ao/JDIYt2Wa69SOiGWBHjS6ElsH4cUyRUcKiPrqWMcuXzD22tJFW/Z+uM/CcIsM9lqJKLAOwcTByRMWId43V8q8yNnzxayccqmJ2ox9Pc6e49+GTkE4vtyA3yLRHhOTrLcOHGNHCTKhyKAVZSdENEFBAo9kVnCcNGDCInsNxnDqj5uhyNX2rpuRDz6WiywtGv7i6XaNDcqcWiPLs5gXKP6ZImd54Mo1pigoXeDagpdcCOJzEDuLFVD+H5A7xuRYP3og2TT3AFWOcVp2hMD0vGK3BmUXU7k5iW1DrUeg4/o982+01fHI8gZKWySyOTKtI8SIRT3YLwxjJNNWWL3bQ9dB+k8oYiHABXxuGpw==" + + slackapi: + ## If true, the specified Slack Channel will be used with Alertmanager and PagerDuty + ## + enabled: true + ## The sealed Slack Channel API URL (sealed with Bitnami's SealedSecret) + url: "AgAG0HyCty3CxW7U4ciM36I4GIBK8gq1va8JLigAPXlKFKI2d9bAIuyGVxP/WGgzAwpHREwVdVlZSeF46lapcxqOunqaMNcNvV6DKUM0bpdoytzkX+IwuilkLxJKpQiMbfoPsqxIJ/7X4qIIV4+08e76TJEJ2ha9tXawhCYM07fIEvaHOkzm/maXKO/Ep20aOX6jBuyoh/BRWFpQ4bnJFNjuuD1t21cmHkvqWJVQT3jHGos5tBCMVHkw01F6c4nHNpAEdiUWPSMwmCuZilEAqpzxo7pwBdP/H79zJBczYhpoTshwm5W39FCrfMGx7HhpBuWPAHFMLN3KtxiN8qu5uiKGyXxPDTEvzby3LcFFydcfdHQTANZj56DWH3vSdYsvluN5mrpjA1X4mvqwqCLkKLNlrNLO7dw6dHnRzNC5VpZAzLY83AJPgdzbqByP6R0QJfCNMWJ0HUiP/afEDQSfvvqUyqWAXH7bnAdqIh554V0tikoxfsOecygqdufXdoYAoFNr3YLnG9HviNNxdAsSXy7Y5utJDs7Ytef4ZnxVHD01M+beNTYs/SOScKi8vJOgHcDKeazVaLmGf+cF2CPzrShBqXE4WMwAE7gRefxTNmjD21JVeWGBEwUhlTtUF9L4hWTkz3UkQuQ4juui8sm+yXRxTvSOZEe36I8lLJhEuklBqck0mbJX6KRMxv8EplZG19rcC4li0Bw34GWonMoaqTD8NkSJvzz5UITCBjU5JmoC4jTanFBdJTR5FIpGoJIGoIWIDkdCj+ayrGN50kExW6llZ12YhEl5t4A+O7RJjg==" + + ingress: ## If true, alertmanager Ingress will be created ## @@ -126,8 +140,7 @@ spec: mountPath: /data ## alertmanager data Persistent Volume size ## - # size: 2Gi - size: 10Gi + size: 30Gi ## alertmanager data Persistent Volume Storage Class ## If defined, storageClassName: ## If set to "-", storageClassName: "", which disables dynamic provisioning @@ -211,11 +224,11 @@ spec: #resources: {} resources: limits: - cpu: 50m - memory: 160Mi + cpu: 100m + memory: 320Mi requests: - cpu: 10m - memory: 32Mi + cpu: 20m + memory: 64Mi initChownData: ## If false, data ownership will not be reset at startup ## This allows the prometheus-server to be run with an arbitrary user @@ -236,11 +249,11 @@ spec: #resources: {} resources: limits: - cpu: 50m - memory: 160Mi + cpu: 75m + memory: 320Mi requests: - cpu: 10m - memory: 32Mi + cpu: 20m + memory: 64Mi kubeStateMetrics: ## If false, kube-state-metrics will not be installed ## @@ -252,7 +265,6 @@ spec: ## image: repository: quay.io/coreos/kube-state-metrics - #tag: v1.3.1 tag: v1.4.0 pullPolicy: IfNotPresent ## kube-state-metrics container arguments @@ -281,11 +293,11 @@ spec: ## resources: limits: - cpu: 50m - memory: 160Mi + cpu: 150m + memory: 480Mi requests: - cpu: 10m - memory: 16Mi + cpu: 30m + memory: 48Mi ## Security context to be added to kube-state-metrics pods ## securityContext: {} @@ -360,11 +372,11 @@ spec: ## resources: limits: - cpu: 100m - memory: 150Mi + cpu: 200m + memory: 300Mi requests: - cpu: 20m - memory: 32Mi + cpu: 40m + memory: 64Mi ## Security context to be added to node-exporter pods ## securityContext: {} @@ -393,8 +405,7 @@ spec: ## image: repository: prom/prometheus - #tag: v2.3.1 - tag: v2.4.3 + tag: v2.5.0 pullPolicy: IfNotPresent ## The URL prefix at which the container can be accessed. Useful in the case the '-web.external-url' includes a slug ## so that the various internal URLs are still able to access as they are in the default case. @@ -416,6 +427,11 @@ spec: ## How frequently to evaluate rules ## evaluation_interval: 1m + ## Attach these labels to any time series or alerts when communicating with + ## external systems (federation, remote storage, Alertmanager). + ## + external_labels: + monitor: 'staging' ## Additional Prometheus server container arguments ## extraArgs: {} @@ -510,8 +526,7 @@ spec: mountPath: /data ## Prometheus server data Persistent Volume size ## - # size: 8Gi - size: 100Gi + size: 250Gi ## Prometheus server data Persistent Volume Storage Class ## If defined, storageClassName: ## If set to "-", storageClassName: "", which disables dynamic provisioning @@ -534,21 +549,27 @@ spec: ## resources: limits: - cpu: 750m - memory: 768Mi + cpu: 1250m + memory: 4Gi requests: - cpu: 500m - memory: 512Mi - + cpu: 750m + memory: 2Gi + ## Security context to be added to server pods ## securityContext: {} + + ## The environment name - shown as a headline in the Prometheus Alerts + # + externalLabels: + cluster: "staging" + service: annotations: nynja.biz/scrape: "true" nynja.biz/scrape_port: "80" - nynja.biz/env: "staging" - nynja.biz/probe: "prometheus" + nynja.biz/env: "staging" + nynja.biz/probe: "prometheus" labels: {} clusterIP: "" ## List of IP addresses at which the Prometheus server service is available @@ -572,6 +593,14 @@ spec: ## Prometheus data retention period (i.e 360h) ## retention: "" + ## Set the namespace where Istio is installed - default: "istio-system" + namespace: + istio: "istio-system" + externalFiles: + rules: + enabled: true + confFile: "rules" + pushgateway: ## If false, pushgateway will not be installed ## @@ -579,7 +608,7 @@ spec: ## pushgateway container name ## name: pushgateway - + ## pushgateway container image ## image: @@ -632,11 +661,11 @@ spec: ## resources: limits: - cpu: 50m - memory: 160Mi + cpu: 100m + memory: 320Mi requests: - cpu: 10m - memory: 32Mi + cpu: 20m + memory: 64Mi ## Security context to be added to push-gateway pods ## securityContext: {} @@ -659,26 +688,64 @@ spec: ## alertmanager ConfigMap entries ## alertmanagerFiles: + notifications.tpl: |- + {{ define "__alertmanager" }}Environment: ___PROMETHEUS_CLUSTER_NAME___{{ end }} + {{ define "__alertmanagerURL" }}{{ .ExternalURL }}/#/alerts?receiver={{ .Receiver }}{{ end }} + + {{ define "__subject" }}[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ .GroupLabels.SortedPairs.Values | join " " }} {{ if gt (len .CommonLabels) (len .GroupLabels) }}({{ with .CommonLabels.Remove .GroupLabels.Names }}{{ .Values | join " " }}{{ end }}){{ end }}{{ end }} + {{ define "__description" }}{{ end }} + + {{ define "__text_alert_list" }}{{ range . }}Labels: + {{ range .Labels.SortedPairs }} - {{ .Name }} = {{ .Value }} + {{ end }}Annotations: + {{ range .Annotations.SortedPairs }} - {{ .Name }} = {{ .Value }} + {{ end }}Source: {{ .GeneratorURL }} + {{ end }}{{ end }} + + + {{ define "slack.default.title" }}{{ template "__subject" . }}{{ end }} + {{ define "slack.default.username" }}{{ template "__alertmanager" . }}{{ end }} + {{ define "slack.default.fallback" }}{{ template "slack.default.title" . }} | {{ template "slack.default.titlelink" . }}{{ end }} + {{ define "slack.default.pretext" }}{{ end }} + {{ define "slack.default.titlelink" }}{{ template "__alertmanagerURL" . }}{{ end }} + {{ define "slack.default.iconemoji" }}{{ end }} + {{ define "slack.default.iconurl" }}{{ end }} + {{ define "slack.default.text" }}{{ end }} + {{ define "slack.default.footer" }}{{ end }} + alertmanager.yml: global: - # slack_api_url: '' - slack_api_url: https://hooks.slack.com/services/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 + slack_api_url: ___ALERTMANAGER_SLACK_API_URL___ + receivers: - name: default-receiver + slack_configs: - - channel: '#ops-alerts' - send_resolved: true - username: 'alerts{{ if eq .Status "firing" }}_firing{{ else }}_resolved{{ end }}' + - channel: '#ops-alerts-staging' + send_resolved: false + username: '{{ template "slack.default.username" . }}' + color: '{{ if eq .Status "firing" }}danger{{ else }}good{{ end }}' title: '{{ template "slack.default.title" . }}' - text: >- - {{ range .Alerts }} - *Alert:* {{ .Annotations.summary }} - `{{ .Labels.severity | toUpper }}` <{{ .GeneratorURL }}|:chart_with_upwards_trend:> - *Description:* {{ .Annotations.description }} - *Details:* - {{ range .Labels.SortedPairs }} • *{{ .Name }}:* `{{ .Value }}` - {{ end }} - {{ end }} - icon_emoji: '{{ if eq .Status "firing" }}:fire:{{ else }}:sun_with_face:{{ end }}' + title_link: '{{ template "slack.default.titlelink" . }}' + pretext: '{{ .CommonAnnotations.summary }}' + text: |- + {{ range .Alerts }} + *Alert:* {{ .Annotations.summary }} - `{{ .Labels.severity }}` + *Description:* {{ .Annotations.description }} + *Details:* + {{ range .Labels.SortedPairs }} • *{{ .Name }}:* `{{ .Value }}` + {{ end }} + {{ end }} + fallback: '{{ template "slack.default.fallback" . }}' + icon_emoji: '{{ template "slack.default.iconemoji" . }}' + icon_url: '{{ template "slack.default.iconurl" . }}' + + pagerduty_configs: + - service_key: ___PAGERDUTY_SERVICEKEY___ + + templates: + - /automations/notifications.tpl + route: group_wait: 30s group_interval: 5m @@ -691,387 +758,20 @@ spec: env: staging group_wait: 5m repeat_interval: 24h + + ## Prometheus server ConfigMap entries ## serverFiles: alerts: {} - rules: - groups: - - name: Cassandra - rules: - - alert: CassandraProbeDown - expr: up{job="cassandra"} != 3 - for: 30s - labels: - severity: major - annotations: - summary: "Cassandra probe down" - description: "The Cassandra probe of {{ $labels.instance }} ({{$labels.env}}) is down" - - alert: CassandraDashboardNotReachable - expr: probe_success{job="cassandra"} == 0 - for: 30s - labels: - severity: major - annotations: - summary: "Cassandra dashboard not reachable" - description: "The Cassandra dashboard on {{ $labels.instance }} ({{ $labels.env }}) is not reachable" - - alert: CassandraDeadNodes - expr: kube_statefulset_replicas{namespace="cassandra",release="prometheus",statefulset="cassandra"} - kube_statefulset_status_replicas{namespace="cassandra",release="prometheus",statefulset="cassandra"} > 0 - for: 30s - labels: - severity: major - annotations: - summary: Cassandra dead nodes count - description: "The Cassandra node of {{ $labels.instance }} ({{$labels.env}}) is down" - - alert: CassandraConnectionTimeouts - expr: sum(cassandra_stats{datacenter="europe-west3", cluster="cassandra",name="org:apache:cassandra:metrics:connection:totaltimeouts:oneminuterate"}) by (name) > 1 - for: 30s - labels: - severity: major - annotations: - summary: Cassandra - number of requests timeouts over 1 min - description: "Cassandra cluster: {{$labels.release}} ({{$labels.env}}) - number of requests timeouts over 1 min" - - name: Monitoring - rules: - - alert: MonitoringStackProbeDown - expr: up{job="monitoring-stack"} != 2 - for: 30s - labels: - severity: major - annotations: - summary: "Monitoring Stack probe down" - description: "The Monitoring Stack probe of {{ $labels.instance }} ({{$labels.env}}) is down" + prometheus.yml: rule_files: - - /etc/config/rules - - /etc/config/alerts - scrape_configs: - - job_name: prometheus - static_configs: - - targets: - - localhost:9090 - labels: - env: staging - #- job_name: grafana - # scrape_interval: 15s - # scrape_timeout: 10s - # metrics_path: /metrics - # scheme: http - # static_configs: - # - targets: - # - "grafana.staging-eu.nynja.net:80" - # labels: - # env: staging - - job_name: 'grafana' - honor_labels: true - kubernetes_sd_configs: - - role: service - relabel_configs: - - source_labels: [__meta_kubernetes_service_annotation_nynja_biz_scrape] - action: keep - regex: true - - source_labels: [__address__, __meta_kubernetes_service_annotation_nynja_biz_scrape_port] - action: replace - target_label: __address__ - regex: ([^:]+)(?::\d+)?;(\d+) - replacement: $1:$2 - - source_labels: [__meta_kubernetes_service_annotation_nynja_biz_env] - action: replace - target_label: env - - source_labels: [__meta_kubernetes_service_annotation_nynja_biz_probe] - action: keep - regex: grafana - - job_name: 'prometheus-pushgateway' - honor_labels: true - kubernetes_sd_configs: - - role: service - relabel_configs: - - source_labels: [__meta_kubernetes_service_annotation_nynja_biz_scrape] - action: keep - regex: true - - source_labels: [__address__, __meta_kubernetes_service_annotation_nynja_biz_scrape_port] - action: replace - target_label: __address__ - regex: ([^:]+)(?::\d+)?;(\d+) - replacement: $1:$2 - - source_labels: [__meta_kubernetes_service_annotation_nynja_biz_env] - action: replace - target_label: env - - source_labels: [__meta_kubernetes_service_annotation_nynja_biz_probe] - action: keep - regex: pushgateway - - job_name: 'prometheus-alertmanager' - honor_labels: true - kubernetes_sd_configs: - - role: service - relabel_configs: - - source_labels: [__meta_kubernetes_service_annotation_nynja_biz_scrape] - action: keep - regex: true - - source_labels: [__address__, __meta_kubernetes_service_annotation_nynja_biz_scrape_port] - action: replace - target_label: __address__ - regex: ([^:]+)(?::\d+)?;(\d+) - replacement: $1:$2 - - source_labels: [__meta_kubernetes_service_annotation_nynja_biz_env] - action: replace - target_label: env - - source_labels: [__meta_kubernetes_service_annotation_nynja_biz_probe] - action: keep - regex: alertmanager - #- job_name: prometheus-alertmanager - # scrape_interval: 15s - # scrape_timeout: 10s - # metrics_path: /metrics - # scheme: http - # static_configs: - # - targets: - # - "10.43.242.113:80" - # labels: - # env: staging - # A scrape configuration for running Prometheus on a Kubernetes cluster. - # This uses separate scrape configs for cluster components (i.e. API server, node) - # and services to allow each to use different authentication configs. - # - # Kubernetes labels will be added as Prometheus labels on metrics via the - # `labelmap` relabeling action. - # Scrape config for API servers. - # - # Kubernetes exposes API servers as endpoints to the default/kubernetes - # service so this uses `endpoints` role and uses relabelling to only keep - # the endpoints associated with the default/kubernetes service using the - # default named port `https`. This works for single API server deployments as - # well as HA API server deployments. - - job_name: 'kubernetes-apiservers' - kubernetes_sd_configs: - - role: endpoints - # Default to scraping over https. If required, just disable this or change to - # `http`. - scheme: https - # This TLS & bearer token file config is used to connect to the actual scrape - # endpoints for cluster components. This is separate to discovery auth - # configuration because discovery & scraping are two separate concerns in - # Prometheus. The discovery auth config is automatic if Prometheus runs inside - # the cluster. Otherwise, more config options have to be provided within the - # . - tls_config: - ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt - # If your node certificates are self-signed or use a different CA to the - # master CA, then disable certificate verification below. Note that - # certificate verification is an integral part of a secure infrastructure - # so this should only be disabled in a controlled environment. You can - # disable certificate verification by uncommenting the line below. - # - insecure_skip_verify: true - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token - # Keep only the default/kubernetes service endpoints for the https port. This - # will add targets for each API server which Kubernetes adds an endpoint to - # the default/kubernetes service. - relabel_configs: - - source_labels: [__meta_kubernetes_namespace, __meta_kubernetes_service_name, __meta_kubernetes_endpoint_port_name] - action: keep - regex: default;kubernetes;https - - job_name: 'kubernetes-nodes' - # Default to scraping over https. If required, just disable this or change to - # `http`. - scheme: https - # This TLS & bearer token file config is used to connect to the actual scrape - # endpoints for cluster components. This is separate to discovery auth - # configuration because discovery & scraping are two separate concerns in - # Prometheus. The discovery auth config is automatic if Prometheus runs inside - # the cluster. Otherwise, more config options have to be provided within the - # . - tls_config: - ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt - # If your node certificates are self-signed or use a different CA to the - # master CA, then disable certificate verification below. Note that - # certificate verification is an integral part of a secure infrastructure - # so this should only be disabled in a controlled environment. You can - # disable certificate verification by uncommenting the line below. - # - insecure_skip_verify: true - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token - kubernetes_sd_configs: - - role: node - relabel_configs: - - action: labelmap - regex: __meta_kubernetes_node_label_(.+) - - target_label: __address__ - replacement: kubernetes.default.svc:443 - - source_labels: [__meta_kubernetes_node_name] - regex: (.+) - target_label: __metrics_path__ - replacement: /api/v1/nodes/${1}/proxy/metrics - - job_name: 'kubernetes-nodes-cadvisor' - # Default to scraping over https. If required, just disable this or change to - # `http`. - scheme: https - # This TLS & bearer token file config is used to connect to the actual scrape - # endpoints for cluster components. This is separate to discovery auth - # configuration because discovery & scraping are two separate concerns in - # Prometheus. The discovery auth config is automatic if Prometheus runs inside - # the cluster. Otherwise, more config options have to be provided within the - # . - tls_config: - ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt - # If your node certificates are self-signed or use a different CA to the - # master CA, then disable certificate verification below. Note that - # certificate verification is an integral part of a secure infrastructure - # so this should only be disabled in a controlled environment. You can - # disable certificate verification by uncommenting the line below. - # - insecure_skip_verify: true - bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token - kubernetes_sd_configs: - - role: node - # This configuration will work only on kubelet 1.7.3+ - # As the scrape endpoints for cAdvisor have changed - # if you are using older version you need to change the replacement to - # replacement: /api/v1/nodes/${1}:4194/proxy/metrics - # more info here https://github.com/coreos/prometheus-operator/issues/633 - relabel_configs: - - action: labelmap - regex: __meta_kubernetes_node_label_(.+) - - target_label: __address__ - replacement: kubernetes.default.svc:443 - - source_labels: [__meta_kubernetes_node_name] - regex: (.+) - target_label: __metrics_path__ - replacement: /api/v1/nodes/${1}/proxy/metrics/cadvisor - # Scrape config for service endpoints. - # - # The relabeling allows the actual service scrape endpoint to be configured - # via the following annotations: - # - # * `prometheus.io/scrape`: Only scrape services that have a value of `true` - # * `prometheus.io/scheme`: If the metrics endpoint is secured then you will need - # to set this to `https` & most likely set the `tls_config` of the scrape config. - # * `prometheus.io/path`: If the metrics path is not `/metrics` override this. - # * `prometheus.io/port`: If the metrics are exposed on a different port to the - # service then set this appropriately. - - job_name: 'kubernetes-service-endpoints' - kubernetes_sd_configs: - - role: endpoints - relabel_configs: - - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scrape] - action: keep - regex: true - - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_scheme] - action: replace - target_label: __scheme__ - regex: (https?) - - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_path] - action: replace - target_label: __metrics_path__ - regex: (.+) - - source_labels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port] - action: replace - target_label: __address__ - regex: ([^:]+)(?::\d+)?;(\d+) - replacement: $1:$2 - - action: labelmap - regex: __meta_kubernetes_service_label_(.+) - - source_labels: [__meta_kubernetes_namespace] - action: replace - target_label: kubernetes_namespace - - source_labels: [__meta_kubernetes_service_name] - action: replace - target_label: kubernetes_name - # Example scrape config for probing services via the Blackbox Exporter. - # - # The relabeling allows the actual service scrape endpoint to be configured - # via the following annotations: - # - # * `prometheus.io/probe`: Only probe services that have a value of `true` - - job_name: 'kubernetes-services' - metrics_path: /probe - params: - module: [http_2xx] - kubernetes_sd_configs: - - role: service - relabel_configs: - - source_labels: [__meta_kubernetes_service_annotation_prometheus_io_probe] - action: keep - regex: true - - source_labels: [__address__] - target_label: __param_target - - target_label: __address__ - replacement: blackbox - - source_labels: [__param_target] - target_label: instance - - action: labelmap - regex: __meta_kubernetes_service_label_(.+) - - source_labels: [__meta_kubernetes_namespace] - target_label: kubernetes_namespace - - source_labels: [__meta_kubernetes_service_name] - target_label: kubernetes_name - # Example scrape config for pods - # - # The relabeling allows the actual pod scrape endpoint to be configured via the - # following annotations: - # - # * `prometheus.io/scrape`: Only scrape pods that have a value of `true` - # * `prometheus.io/path`: If the metrics path is not `/metrics` override this. - # * `prometheus.io/port`: Scrape the pod on the indicated port instead of the default of `9102`. - - job_name: 'kubernetes-pods' - kubernetes_sd_configs: - - role: pod - relabel_configs: - - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_scrape] - action: keep - regex: true - - source_labels: [__meta_kubernetes_pod_annotation_prometheus_io_path] - action: replace - target_label: __metrics_path__ - regex: (.+) - - source_labels: [__address__, __meta_kubernetes_pod_annotation_prometheus_io_port] - action: replace - regex: ([^:]+)(?::\d+)?;(\d+) - replacement: $1:$2 - target_label: __address__ - - action: labelmap - regex: __meta_kubernetes_pod_label_(.+) - - source_labels: [__meta_kubernetes_namespace] - action: replace - target_label: kubernetes_namespace - - source_labels: [__meta_kubernetes_pod_name] - action: replace - target_label: kubernetes_pod_name - - job_name: 'cassandra' - kubernetes_sd_configs: - - role: endpoints - relabel_configs: - - source_labels: [__meta_kubernetes_service_annotation_nynja_biz_scrape] - action: keep - regex: true - - source_labels: [__meta_kubernetes_service_annotation_nynja_biz_scheme] - action: replace - target_label: __scheme__ - regex: (https?) - - source_labels: [__meta_kubernetes_service_annotation_nynja_biz_path] - action: replace - target_label: __metrics_path__ - regex: (.+) - - source_labels: [__address__, __meta_kubernetes_service_annotation_nynja_biz_scrape_port] - action: replace - target_label: __address__ - regex: ([^:]+)(?::\d+)?;(\d+) - replacement: $1:$2 - - action: labelmap - regex: __meta_kubernetes_service_label_(.+) - - source_labels: [__meta_kubernetes_namespace] - action: replace - target_label: kubernetes_namespace - - source_labels: [__meta_kubernetes_service_name] - action: replace - target_label: kubernetes_name - - source_labels: [__meta_kubernetes_service_annotation_nynja_biz_env] - action: replace - target_label: env - - source_labels: [__meta_kubernetes_service_annotation_nynja_biz_probe] - action: keep - regex: cassandra-exporter + - /data/etc/config/rules + - /data/etc/config/alerts + + networkPolicy: ## Enable creation of NetworkPolicy resources. ## - enabled: false \ No newline at end of file + enabled: false -- GitLab From 2afdc5234ce41a86bee0ea2f48979f97f8ffd4fa Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Fri, 7 Dec 2018 16:10:31 +0200 Subject: [PATCH 02/46] Trying to fix the error - "Error: failed to download "nynja/prometheus"" in Jenkins. --- monitoring/prometheus.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index 3b02b33..e4ed5e3 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -76,6 +76,7 @@ spec: ingress: ## If true, alertmanager Ingress will be created ## + # enabled: false ## alertmanager Ingress annotations ## -- GitLab From 60af2399008ca397c70d8d6df5cab8f241d67b14 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Sat, 8 Dec 2018 15:00:48 +0200 Subject: [PATCH 03/46] A fix attepmt for the issue only in `staging`: "parsing YAML file /data/etc/config/prometheus.yml: yaml: unmarshal errors". --- monitoring/prometheus.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index e4ed5e3..7aa8431 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -68,6 +68,7 @@ spec: slackapi: ## If true, the specified Slack Channel will be used with Alertmanager and PagerDuty ## + # enabled: true ## The sealed Slack Channel API URL (sealed with Bitnami's SealedSecret) url: "AgAG0HyCty3CxW7U4ciM36I4GIBK8gq1va8JLigAPXlKFKI2d9bAIuyGVxP/WGgzAwpHREwVdVlZSeF46lapcxqOunqaMNcNvV6DKUM0bpdoytzkX+IwuilkLxJKpQiMbfoPsqxIJ/7X4qIIV4+08e76TJEJ2ha9tXawhCYM07fIEvaHOkzm/maXKO/Ep20aOX6jBuyoh/BRWFpQ4bnJFNjuuD1t21cmHkvqWJVQT3jHGos5tBCMVHkw01F6c4nHNpAEdiUWPSMwmCuZilEAqpzxo7pwBdP/H79zJBczYhpoTshwm5W39FCrfMGx7HhpBuWPAHFMLN3KtxiN8qu5uiKGyXxPDTEvzby3LcFFydcfdHQTANZj56DWH3vSdYsvluN5mrpjA1X4mvqwqCLkKLNlrNLO7dw6dHnRzNC5VpZAzLY83AJPgdzbqByP6R0QJfCNMWJ0HUiP/afEDQSfvvqUyqWAXH7bnAdqIh554V0tikoxfsOecygqdufXdoYAoFNr3YLnG9HviNNxdAsSXy7Y5utJDs7Ytef4ZnxVHD01M+beNTYs/SOScKi8vJOgHcDKeazVaLmGf+cF2CPzrShBqXE4WMwAE7gRefxTNmjD21JVeWGBEwUhlTtUF9L4hWTkz3UkQuQ4juui8sm+yXRxTvSOZEe36I8lLJhEuklBqck0mbJX6KRMxv8EplZG19rcC4li0Bw34GWonMoaqTD8NkSJvzz5UITCBjU5JmoC4jTanFBdJTR5FIpGoJIGoIWIDkdCj+ayrGN50kExW6llZ12YhEl5t4A+O7RJjg==" @@ -76,7 +77,6 @@ spec: ingress: ## If true, alertmanager Ingress will be created ## - # enabled: false ## alertmanager Ingress annotations ## @@ -565,7 +565,6 @@ spec: externalLabels: cluster: "staging" - service: annotations: nynja.biz/scrape: "true" @@ -603,7 +602,6 @@ spec: enabled: true confFile: "rules" - pushgateway: ## If false, pushgateway will not be installed ## -- GitLab From 7bcac5a75b0564f4d40d2b5661a67ec5cb6965c2 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Mon, 10 Dec 2018 10:48:27 +0200 Subject: [PATCH 04/46] A final fix on 'staging' env for the issue in certain situations: "parsing YAML file /data/etc/config/prometheus.yml: yaml: unmarshal errors". --- monitoring/prometheus.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index 7aa8431..22ef88b 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -63,7 +63,7 @@ spec: ## enabled: true ## The sealed PagerDuty Service Key (sealed with Bitnami's SealedSecret) - servicekey: "AgAdqruztyqLNjqgyNlKmR9SrdeX49+/ujHMIYFC9n1yCRxS28uxsiXXQBoXBuMA8oaKctAiavFEWviFtNdcmvvnrfVVTjMOZCQMpdKXSBYjwOyMg+bLFoEdjcgJoy+OSFLLnZ4Bx72rPIycwF4jiz9+eznTCvt+W7u4H/Jh54sc9c3va8z9KSBNdL2poOphjLVqgkmegP5crSHhwA12X5EEsFhC1xFZd1cPMfLpxNThuCiL9H77nzk/m9bgQiyMcpBypaiElZHPNxlgDtvu+av/27y3/XscCPtGb35qroU9XhdNsr5Js2Fs/GG+SX3zb6EdEa2DnbaVNSYTJGXj2iEc0c2VdMCr8+xIa+PmH4wY9E+lxVZS6cE0TjBF7Yl+8+zCZ6Q5Ao/JDIYt2Wa69SOiGWBHjS6ElsH4cUyRUcKiPrqWMcuXzD22tJFW/Z+uM/CcIsM9lqJKLAOwcTByRMWId43V8q8yNnzxayccqmJ2ox9Pc6e49+GTkE4vtyA3yLRHhOTrLcOHGNHCTKhyKAVZSdENEFBAo9kVnCcNGDCInsNxnDqj5uhyNX2rpuRDz6WiywtGv7i6XaNDcqcWiPLs5gXKP6ZImd54Mo1pigoXeDagpdcCOJzEDuLFVD+H5A7xuRYP3og2TT3AFWOcVp2hMD0vGK3BmUXU7k5iW1DrUeg4/o982+01fHI8gZKWySyOTKtI8SIRT3YLwxjJNNWWL3bQ9dB+k8oYiHABXxuGpw==" + servicekey: "AgAiX+HSlRoh0ljLuQjelMobs5lu6mY5nkbDmfLkIO+4s02GgDAtbNvMRVmKvBvWFCXD/KzkQw+7+ja1IRam5VK85Pi29EpBjdfgQp/sX5fSTrR4ybxjdAeBvHrEirX7RPaX/9RBnb0WJLsJlS6zQ5hYQz/AkNfaCIVKumecsh3Cy2UeOXDGJiW/bPt4veVEN0iUYgnKCZlmr80mCbaAe44IVMHix74BDRA3CbJt8hJDGqC2x8TbElWNq3zAC4rB7Rl5qTsJh4ZNmIJVFCzwc0E3+Z61KBIRs0st2fetlTnT+6L+pODFP5wsC59LRCKWrS2N9Ah24Vxz0iDThJlHLECUpcce33mSYiJ9A/iuAmLAgZcwqz9gtGQC2rl7Xwnq7hCbWHB9TgzYrJbiJLPYsS265yw5R7VBwq3/uCbnEagEtJ+fmfR4iTywFDQt/Iw7jj+rVb2rq1u2IoS5CMOxIN2pYucS2jLvJ4z17NJrKnhNmWc4bWWxneRlLVB7oDPPeIWdl4QjsQ61uGNU8Ok0DHxyqCIQ3yf5p/TaLCfePoo7Xa4BnL87bg1Q0Hr9FFdZy8evIrbbUJIC/9bWFyw3rG/0TGV5rbBiH/2vR4ZEd81StLFMtmcWhU0Le2lazXobdpginlZmQOMRWu8jLTp7VxkJhdi8cAoAk9x9UW/Qp907nVpGcjc5DRKgQD2vBYF09ZVQSbHM6rCpjrmVZK0hmUzd/hHXKkuaIV6wrfJnCSNzFA==" slackapi: ## If true, the specified Slack Channel will be used with Alertmanager and PagerDuty @@ -71,7 +71,7 @@ spec: # enabled: true ## The sealed Slack Channel API URL (sealed with Bitnami's SealedSecret) - url: "AgAG0HyCty3CxW7U4ciM36I4GIBK8gq1va8JLigAPXlKFKI2d9bAIuyGVxP/WGgzAwpHREwVdVlZSeF46lapcxqOunqaMNcNvV6DKUM0bpdoytzkX+IwuilkLxJKpQiMbfoPsqxIJ/7X4qIIV4+08e76TJEJ2ha9tXawhCYM07fIEvaHOkzm/maXKO/Ep20aOX6jBuyoh/BRWFpQ4bnJFNjuuD1t21cmHkvqWJVQT3jHGos5tBCMVHkw01F6c4nHNpAEdiUWPSMwmCuZilEAqpzxo7pwBdP/H79zJBczYhpoTshwm5W39FCrfMGx7HhpBuWPAHFMLN3KtxiN8qu5uiKGyXxPDTEvzby3LcFFydcfdHQTANZj56DWH3vSdYsvluN5mrpjA1X4mvqwqCLkKLNlrNLO7dw6dHnRzNC5VpZAzLY83AJPgdzbqByP6R0QJfCNMWJ0HUiP/afEDQSfvvqUyqWAXH7bnAdqIh554V0tikoxfsOecygqdufXdoYAoFNr3YLnG9HviNNxdAsSXy7Y5utJDs7Ytef4ZnxVHD01M+beNTYs/SOScKi8vJOgHcDKeazVaLmGf+cF2CPzrShBqXE4WMwAE7gRefxTNmjD21JVeWGBEwUhlTtUF9L4hWTkz3UkQuQ4juui8sm+yXRxTvSOZEe36I8lLJhEuklBqck0mbJX6KRMxv8EplZG19rcC4li0Bw34GWonMoaqTD8NkSJvzz5UITCBjU5JmoC4jTanFBdJTR5FIpGoJIGoIWIDkdCj+ayrGN50kExW6llZ12YhEl5t4A+O7RJjg==" + url: "AgArB71t2jdm1e6+hT/UYHpX+jmbuiLtQoRv6/lWaktD5TQsVxHzu/sxHmGsuUQfRo28pJRi3AgSH7Ji9/TnmJvaYtkSv9iyOLtx4UlmhiFDB6Z7x/CFuyvpb7wylSFjIlzYrefGhD02ST9FdwDLBzLWptQugfFt8hMjZi9ImyA3QMJh06BankQjHj8aWEOQxkMESFxAcF8x4EY2FadqEDAYred+MS6Qz/zd4mNiFl5rNhmskX4I/VjdKlI5pdcvy8b8o5ci8DXIUZaTdhvwznyXyu1JQBxC8tO0oaXveuPfn3r6ENJN32p1RzhZ1CRCSSPZFVq6aZzL5lfRuoI0QMAOjPbBJNIkq6cFqZonXhipsXH99QSXdxIwKhFOE7HhlnoV+3YoBpRvQf+uVoj3GSjwBsEJjb4TIgQ0jj5dNEe3EuJhBlDOr988wnocMibw8L6hffWPMGgai52+W8C9UJh7B2r0M8dFf5KzDsGu1PCnSMehCfcFv9n5OpQyzCehgyJ6MickdhbnGE67tLVkI69N/8okVeCJLaDYQmZfJdTWkNNWL8rGfNxbyc7q/GtZmhPex0MYVru1+xLxm1g/TI6myBsvqH4AZHf5fZkvYyTNOfzfTZ2/QSaZK6NkSErWr5h3vBfVf49bU32O8U9f1ZiEjQilCEF5BkkiA7A1ywF5NMTkZAl0I/65kHyoZa2F9eTE6YxMynafLrhjgRdxvYVgX2B4Ur/QqkL/J++9T0vGYBYnPr7cwJ4ZUNhTjkh+HCu0D9VT4n0TDuZp0EA8dtC4O2ZOuGGujvso/hriqw==" ingress: @@ -601,6 +601,9 @@ spec: rules: enabled: true confFile: "rules" + scrape_configs: + enabled: true + confFile: "scrape_configs" pushgateway: ## If false, pushgateway will not be installed -- GitLab From 7f1f7a337713a0a0acf9fc973993ba51b0c1e95a Mon Sep 17 00:00:00 2001 From: Nynja CI Date: Tue, 11 Dec 2018 13:39:03 +0000 Subject: [PATCH 05/46] Updated nynja-app-web tag to master-18 --- nynja-app/nynja-app-web.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nynja-app/nynja-app-web.yaml b/nynja-app/nynja-app-web.yaml index c8b0ba3..eb1a9a4 100644 --- a/nynja-app/nynja-app-web.yaml +++ b/nynja-app/nynja-app-web.yaml @@ -13,7 +13,7 @@ spec: sealedSecret: "AgB1U6XCWIIhXPxZ1VqYUQN0uPwtwCfSVw8/LeV1z9noSalqmSi4a5SW4aRHE71RMN6uDHoPQp6lbMqxxAt8Ze9K5iRlg91cJoFRso7IvF9iG8W/O3HpWCdcdigSz9yiG7H5KR2ZfnOpqNUtObejzSFxlfewzOyQz5h/rbDImLiB+9S7mbpdVCINDTSkW3gNUv30jRtM/gvcKYTZAkup5SvRRSLI9/xsRi6JrPU8yvMd5nPqAIe+hIUqBwIcTwPBRf+chqjU+7kcSsZNIhNITCcUmpRT/ykl/u/fW8DQ/a1NYhFrnZRCxR/pAwk9NJH0b9jWrf4ieZz9/icia0mTu39+AK1j2zcBBSmCsnNJVXkgeOJd1qJ1U1E7h32+q6tTSDy1oma0avAArRPbyFr11BXXYMAOENlPiSQh1qeHirXlc/3QMnIVKQ9HKI23S1qS7BkdAgky8ChFQ6XBwJJF/pejdSw6b6ZMcgs8GFcPayp0VkjucX98S0CbUK10N77iyEpxDlcYyt15+bIZiQlVARV9Fyd4S6L//FwiBn5QHO/foVIK2tnL7xuQy8cLN4x2JEBI1Y24HjpbIHUL6lkPGqs5mY2qOGACaze4WJ5IhT4tTvs76XyzmLnYUECB7+DIPu2Hks9wCyou7NPNiASBptPGRL9c1RJqow8ZORNOv0nvTkJrVO3jl7wsN8HzEMyGYdSJfXzkIDNUmIhlhgvOY9WeB1ZXUW+xawXqADAC/bpfTYUjziv2J0CkVrb25w==" image: repository: eu.gcr.io/nynja-ci-201610/nynja-app/nynja-app-web - tag: master-17 + tag: master-18 gateway: selector: - api-gateway.default.svc.cluster.local -- GitLab From cff0d54b8b1cc0432de149cd86e52985cbab5e0c Mon Sep 17 00:00:00 2001 From: Nynja CI Date: Wed, 12 Dec 2018 12:30:00 +0000 Subject: [PATCH 06/46] Updated nynja-app-web tag to master-19 --- nynja-app/nynja-app-web.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nynja-app/nynja-app-web.yaml b/nynja-app/nynja-app-web.yaml index eb1a9a4..29685c9 100644 --- a/nynja-app/nynja-app-web.yaml +++ b/nynja-app/nynja-app-web.yaml @@ -13,7 +13,7 @@ spec: sealedSecret: "AgB1U6XCWIIhXPxZ1VqYUQN0uPwtwCfSVw8/LeV1z9noSalqmSi4a5SW4aRHE71RMN6uDHoPQp6lbMqxxAt8Ze9K5iRlg91cJoFRso7IvF9iG8W/O3HpWCdcdigSz9yiG7H5KR2ZfnOpqNUtObejzSFxlfewzOyQz5h/rbDImLiB+9S7mbpdVCINDTSkW3gNUv30jRtM/gvcKYTZAkup5SvRRSLI9/xsRi6JrPU8yvMd5nPqAIe+hIUqBwIcTwPBRf+chqjU+7kcSsZNIhNITCcUmpRT/ykl/u/fW8DQ/a1NYhFrnZRCxR/pAwk9NJH0b9jWrf4ieZz9/icia0mTu39+AK1j2zcBBSmCsnNJVXkgeOJd1qJ1U1E7h32+q6tTSDy1oma0avAArRPbyFr11BXXYMAOENlPiSQh1qeHirXlc/3QMnIVKQ9HKI23S1qS7BkdAgky8ChFQ6XBwJJF/pejdSw6b6ZMcgs8GFcPayp0VkjucX98S0CbUK10N77iyEpxDlcYyt15+bIZiQlVARV9Fyd4S6L//FwiBn5QHO/foVIK2tnL7xuQy8cLN4x2JEBI1Y24HjpbIHUL6lkPGqs5mY2qOGACaze4WJ5IhT4tTvs76XyzmLnYUECB7+DIPu2Hks9wCyou7NPNiASBptPGRL9c1RJqow8ZORNOv0nvTkJrVO3jl7wsN8HzEMyGYdSJfXzkIDNUmIhlhgvOY9WeB1ZXUW+xawXqADAC/bpfTYUjziv2J0CkVrb25w==" image: repository: eu.gcr.io/nynja-ci-201610/nynja-app/nynja-app-web - tag: master-18 + tag: master-19 gateway: selector: - api-gateway.default.svc.cluster.local -- GitLab From f9147f2f380de24c6ea730c22b72dced7e66fe4d Mon Sep 17 00:00:00 2001 From: Nynja CI Date: Thu, 13 Dec 2018 12:58:16 +0000 Subject: [PATCH 07/46] Updated nynja-app-web tag to master-20 --- nynja-app/nynja-app-web.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nynja-app/nynja-app-web.yaml b/nynja-app/nynja-app-web.yaml index 29685c9..1094655 100644 --- a/nynja-app/nynja-app-web.yaml +++ b/nynja-app/nynja-app-web.yaml @@ -13,7 +13,7 @@ spec: sealedSecret: "AgB1U6XCWIIhXPxZ1VqYUQN0uPwtwCfSVw8/LeV1z9noSalqmSi4a5SW4aRHE71RMN6uDHoPQp6lbMqxxAt8Ze9K5iRlg91cJoFRso7IvF9iG8W/O3HpWCdcdigSz9yiG7H5KR2ZfnOpqNUtObejzSFxlfewzOyQz5h/rbDImLiB+9S7mbpdVCINDTSkW3gNUv30jRtM/gvcKYTZAkup5SvRRSLI9/xsRi6JrPU8yvMd5nPqAIe+hIUqBwIcTwPBRf+chqjU+7kcSsZNIhNITCcUmpRT/ykl/u/fW8DQ/a1NYhFrnZRCxR/pAwk9NJH0b9jWrf4ieZz9/icia0mTu39+AK1j2zcBBSmCsnNJVXkgeOJd1qJ1U1E7h32+q6tTSDy1oma0avAArRPbyFr11BXXYMAOENlPiSQh1qeHirXlc/3QMnIVKQ9HKI23S1qS7BkdAgky8ChFQ6XBwJJF/pejdSw6b6ZMcgs8GFcPayp0VkjucX98S0CbUK10N77iyEpxDlcYyt15+bIZiQlVARV9Fyd4S6L//FwiBn5QHO/foVIK2tnL7xuQy8cLN4x2JEBI1Y24HjpbIHUL6lkPGqs5mY2qOGACaze4WJ5IhT4tTvs76XyzmLnYUECB7+DIPu2Hks9wCyou7NPNiASBptPGRL9c1RJqow8ZORNOv0nvTkJrVO3jl7wsN8HzEMyGYdSJfXzkIDNUmIhlhgvOY9WeB1ZXUW+xawXqADAC/bpfTYUjziv2J0CkVrb25w==" image: repository: eu.gcr.io/nynja-ci-201610/nynja-app/nynja-app-web - tag: master-19 + tag: master-20 gateway: selector: - api-gateway.default.svc.cluster.local -- GitLab From e0acb6922262fa3290a46bf8c33a7103de22de27 Mon Sep 17 00:00:00 2001 From: Nynja CI Date: Fri, 14 Dec 2018 12:12:30 +0000 Subject: [PATCH 08/46] Updated nynja-app-web tag to master-21 --- nynja-app/nynja-app-web.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nynja-app/nynja-app-web.yaml b/nynja-app/nynja-app-web.yaml index 1094655..017f6ae 100644 --- a/nynja-app/nynja-app-web.yaml +++ b/nynja-app/nynja-app-web.yaml @@ -13,7 +13,7 @@ spec: sealedSecret: "AgB1U6XCWIIhXPxZ1VqYUQN0uPwtwCfSVw8/LeV1z9noSalqmSi4a5SW4aRHE71RMN6uDHoPQp6lbMqxxAt8Ze9K5iRlg91cJoFRso7IvF9iG8W/O3HpWCdcdigSz9yiG7H5KR2ZfnOpqNUtObejzSFxlfewzOyQz5h/rbDImLiB+9S7mbpdVCINDTSkW3gNUv30jRtM/gvcKYTZAkup5SvRRSLI9/xsRi6JrPU8yvMd5nPqAIe+hIUqBwIcTwPBRf+chqjU+7kcSsZNIhNITCcUmpRT/ykl/u/fW8DQ/a1NYhFrnZRCxR/pAwk9NJH0b9jWrf4ieZz9/icia0mTu39+AK1j2zcBBSmCsnNJVXkgeOJd1qJ1U1E7h32+q6tTSDy1oma0avAArRPbyFr11BXXYMAOENlPiSQh1qeHirXlc/3QMnIVKQ9HKI23S1qS7BkdAgky8ChFQ6XBwJJF/pejdSw6b6ZMcgs8GFcPayp0VkjucX98S0CbUK10N77iyEpxDlcYyt15+bIZiQlVARV9Fyd4S6L//FwiBn5QHO/foVIK2tnL7xuQy8cLN4x2JEBI1Y24HjpbIHUL6lkPGqs5mY2qOGACaze4WJ5IhT4tTvs76XyzmLnYUECB7+DIPu2Hks9wCyou7NPNiASBptPGRL9c1RJqow8ZORNOv0nvTkJrVO3jl7wsN8HzEMyGYdSJfXzkIDNUmIhlhgvOY9WeB1ZXUW+xawXqADAC/bpfTYUjziv2J0CkVrb25w==" image: repository: eu.gcr.io/nynja-ci-201610/nynja-app/nynja-app-web - tag: master-20 + tag: master-21 gateway: selector: - api-gateway.default.svc.cluster.local -- GitLab From ad50ed4614dc064a27797b27fd265d80eb3a4e5c Mon Sep 17 00:00:00 2001 From: Alexandr Ivanov Date: Tue, 18 Dec 2018 14:25:39 +0200 Subject: [PATCH 09/46] Update nynja-app-web.yaml changed confcall service name --- nynja-app/nynja-app-web.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nynja-app/nynja-app-web.yaml b/nynja-app/nynja-app-web.yaml index 017f6ae..185a4b2 100644 --- a/nynja-app/nynja-app-web.yaml +++ b/nynja-app/nynja-app-web.yaml @@ -26,4 +26,4 @@ spec: mqtt: host: 35.198.110.223 confcall: - service: calling-service-internal-preprod.callconf.svc.cluster.local + service: calling-service-preprod.callconf.svc.cluster.local -- GitLab From 6fbdb8c60b7e8684df32f923da03174cfe4406ad Mon Sep 17 00:00:00 2001 From: Nynja CI Date: Tue, 18 Dec 2018 12:58:43 +0000 Subject: [PATCH 10/46] Updated nynja-app-web tag to master-22 --- nynja-app/nynja-app-web.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nynja-app/nynja-app-web.yaml b/nynja-app/nynja-app-web.yaml index 185a4b2..ae990b6 100644 --- a/nynja-app/nynja-app-web.yaml +++ b/nynja-app/nynja-app-web.yaml @@ -13,7 +13,7 @@ spec: sealedSecret: "AgB1U6XCWIIhXPxZ1VqYUQN0uPwtwCfSVw8/LeV1z9noSalqmSi4a5SW4aRHE71RMN6uDHoPQp6lbMqxxAt8Ze9K5iRlg91cJoFRso7IvF9iG8W/O3HpWCdcdigSz9yiG7H5KR2ZfnOpqNUtObejzSFxlfewzOyQz5h/rbDImLiB+9S7mbpdVCINDTSkW3gNUv30jRtM/gvcKYTZAkup5SvRRSLI9/xsRi6JrPU8yvMd5nPqAIe+hIUqBwIcTwPBRf+chqjU+7kcSsZNIhNITCcUmpRT/ykl/u/fW8DQ/a1NYhFrnZRCxR/pAwk9NJH0b9jWrf4ieZz9/icia0mTu39+AK1j2zcBBSmCsnNJVXkgeOJd1qJ1U1E7h32+q6tTSDy1oma0avAArRPbyFr11BXXYMAOENlPiSQh1qeHirXlc/3QMnIVKQ9HKI23S1qS7BkdAgky8ChFQ6XBwJJF/pejdSw6b6ZMcgs8GFcPayp0VkjucX98S0CbUK10N77iyEpxDlcYyt15+bIZiQlVARV9Fyd4S6L//FwiBn5QHO/foVIK2tnL7xuQy8cLN4x2JEBI1Y24HjpbIHUL6lkPGqs5mY2qOGACaze4WJ5IhT4tTvs76XyzmLnYUECB7+DIPu2Hks9wCyou7NPNiASBptPGRL9c1RJqow8ZORNOv0nvTkJrVO3jl7wsN8HzEMyGYdSJfXzkIDNUmIhlhgvOY9WeB1ZXUW+xawXqADAC/bpfTYUjziv2J0CkVrb25w==" image: repository: eu.gcr.io/nynja-ci-201610/nynja-app/nynja-app-web - tag: master-21 + tag: master-22 gateway: selector: - api-gateway.default.svc.cluster.local @@ -26,4 +26,4 @@ spec: mqtt: host: 35.198.110.223 confcall: - service: calling-service-preprod.callconf.svc.cluster.local + service: calling-service-internal-preprod.callconf.svc.cluster.local -- GitLab From 7f1a417abd703e6b74a0def59dcf3fc7f954cd85 Mon Sep 17 00:00:00 2001 From: Nynja CI Date: Wed, 19 Dec 2018 14:16:03 +0000 Subject: [PATCH 11/46] Updated nynja-app-web tag to master-23 --- nynja-app/nynja-app-web.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nynja-app/nynja-app-web.yaml b/nynja-app/nynja-app-web.yaml index ae990b6..19cf2c8 100644 --- a/nynja-app/nynja-app-web.yaml +++ b/nynja-app/nynja-app-web.yaml @@ -13,7 +13,7 @@ spec: sealedSecret: "AgB1U6XCWIIhXPxZ1VqYUQN0uPwtwCfSVw8/LeV1z9noSalqmSi4a5SW4aRHE71RMN6uDHoPQp6lbMqxxAt8Ze9K5iRlg91cJoFRso7IvF9iG8W/O3HpWCdcdigSz9yiG7H5KR2ZfnOpqNUtObejzSFxlfewzOyQz5h/rbDImLiB+9S7mbpdVCINDTSkW3gNUv30jRtM/gvcKYTZAkup5SvRRSLI9/xsRi6JrPU8yvMd5nPqAIe+hIUqBwIcTwPBRf+chqjU+7kcSsZNIhNITCcUmpRT/ykl/u/fW8DQ/a1NYhFrnZRCxR/pAwk9NJH0b9jWrf4ieZz9/icia0mTu39+AK1j2zcBBSmCsnNJVXkgeOJd1qJ1U1E7h32+q6tTSDy1oma0avAArRPbyFr11BXXYMAOENlPiSQh1qeHirXlc/3QMnIVKQ9HKI23S1qS7BkdAgky8ChFQ6XBwJJF/pejdSw6b6ZMcgs8GFcPayp0VkjucX98S0CbUK10N77iyEpxDlcYyt15+bIZiQlVARV9Fyd4S6L//FwiBn5QHO/foVIK2tnL7xuQy8cLN4x2JEBI1Y24HjpbIHUL6lkPGqs5mY2qOGACaze4WJ5IhT4tTvs76XyzmLnYUECB7+DIPu2Hks9wCyou7NPNiASBptPGRL9c1RJqow8ZORNOv0nvTkJrVO3jl7wsN8HzEMyGYdSJfXzkIDNUmIhlhgvOY9WeB1ZXUW+xawXqADAC/bpfTYUjziv2J0CkVrb25w==" image: repository: eu.gcr.io/nynja-ci-201610/nynja-app/nynja-app-web - tag: master-22 + tag: master-23 gateway: selector: - api-gateway.default.svc.cluster.local -- GitLab From caf041569df926720a0ceb25265825808b242049 Mon Sep 17 00:00:00 2001 From: Nynja CI Date: Thu, 20 Dec 2018 10:52:02 +0000 Subject: [PATCH 12/46] Updated nynja-app-web tag to master-25 --- nynja-app/nynja-app-web.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nynja-app/nynja-app-web.yaml b/nynja-app/nynja-app-web.yaml index 19cf2c8..d90b55c 100644 --- a/nynja-app/nynja-app-web.yaml +++ b/nynja-app/nynja-app-web.yaml @@ -13,7 +13,7 @@ spec: sealedSecret: "AgB1U6XCWIIhXPxZ1VqYUQN0uPwtwCfSVw8/LeV1z9noSalqmSi4a5SW4aRHE71RMN6uDHoPQp6lbMqxxAt8Ze9K5iRlg91cJoFRso7IvF9iG8W/O3HpWCdcdigSz9yiG7H5KR2ZfnOpqNUtObejzSFxlfewzOyQz5h/rbDImLiB+9S7mbpdVCINDTSkW3gNUv30jRtM/gvcKYTZAkup5SvRRSLI9/xsRi6JrPU8yvMd5nPqAIe+hIUqBwIcTwPBRf+chqjU+7kcSsZNIhNITCcUmpRT/ykl/u/fW8DQ/a1NYhFrnZRCxR/pAwk9NJH0b9jWrf4ieZz9/icia0mTu39+AK1j2zcBBSmCsnNJVXkgeOJd1qJ1U1E7h32+q6tTSDy1oma0avAArRPbyFr11BXXYMAOENlPiSQh1qeHirXlc/3QMnIVKQ9HKI23S1qS7BkdAgky8ChFQ6XBwJJF/pejdSw6b6ZMcgs8GFcPayp0VkjucX98S0CbUK10N77iyEpxDlcYyt15+bIZiQlVARV9Fyd4S6L//FwiBn5QHO/foVIK2tnL7xuQy8cLN4x2JEBI1Y24HjpbIHUL6lkPGqs5mY2qOGACaze4WJ5IhT4tTvs76XyzmLnYUECB7+DIPu2Hks9wCyou7NPNiASBptPGRL9c1RJqow8ZORNOv0nvTkJrVO3jl7wsN8HzEMyGYdSJfXzkIDNUmIhlhgvOY9WeB1ZXUW+xawXqADAC/bpfTYUjziv2J0CkVrb25w==" image: repository: eu.gcr.io/nynja-ci-201610/nynja-app/nynja-app-web - tag: master-23 + tag: master-25 gateway: selector: - api-gateway.default.svc.cluster.local -- GitLab From 5d474527f16b9905b43f63aa11c670789063fab9 Mon Sep 17 00:00:00 2001 From: Nynja CI Date: Thu, 20 Dec 2018 13:09:34 +0000 Subject: [PATCH 13/46] Updated nynja-app-web tag to master-26 --- nynja-app/nynja-app-web.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nynja-app/nynja-app-web.yaml b/nynja-app/nynja-app-web.yaml index d90b55c..9dbb4dd 100644 --- a/nynja-app/nynja-app-web.yaml +++ b/nynja-app/nynja-app-web.yaml @@ -13,7 +13,7 @@ spec: sealedSecret: "AgB1U6XCWIIhXPxZ1VqYUQN0uPwtwCfSVw8/LeV1z9noSalqmSi4a5SW4aRHE71RMN6uDHoPQp6lbMqxxAt8Ze9K5iRlg91cJoFRso7IvF9iG8W/O3HpWCdcdigSz9yiG7H5KR2ZfnOpqNUtObejzSFxlfewzOyQz5h/rbDImLiB+9S7mbpdVCINDTSkW3gNUv30jRtM/gvcKYTZAkup5SvRRSLI9/xsRi6JrPU8yvMd5nPqAIe+hIUqBwIcTwPBRf+chqjU+7kcSsZNIhNITCcUmpRT/ykl/u/fW8DQ/a1NYhFrnZRCxR/pAwk9NJH0b9jWrf4ieZz9/icia0mTu39+AK1j2zcBBSmCsnNJVXkgeOJd1qJ1U1E7h32+q6tTSDy1oma0avAArRPbyFr11BXXYMAOENlPiSQh1qeHirXlc/3QMnIVKQ9HKI23S1qS7BkdAgky8ChFQ6XBwJJF/pejdSw6b6ZMcgs8GFcPayp0VkjucX98S0CbUK10N77iyEpxDlcYyt15+bIZiQlVARV9Fyd4S6L//FwiBn5QHO/foVIK2tnL7xuQy8cLN4x2JEBI1Y24HjpbIHUL6lkPGqs5mY2qOGACaze4WJ5IhT4tTvs76XyzmLnYUECB7+DIPu2Hks9wCyou7NPNiASBptPGRL9c1RJqow8ZORNOv0nvTkJrVO3jl7wsN8HzEMyGYdSJfXzkIDNUmIhlhgvOY9WeB1ZXUW+xawXqADAC/bpfTYUjziv2J0CkVrb25w==" image: repository: eu.gcr.io/nynja-ci-201610/nynja-app/nynja-app-web - tag: master-25 + tag: master-26 gateway: selector: - api-gateway.default.svc.cluster.local -- GitLab From 5816ffcce93556d9cc5f04f7c0a29c2e16761f0c Mon Sep 17 00:00:00 2001 From: Nynja CI Date: Thu, 20 Dec 2018 15:11:48 +0000 Subject: [PATCH 14/46] Updated nynja-app-web tag to master-27 --- nynja-app/nynja-app-web.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nynja-app/nynja-app-web.yaml b/nynja-app/nynja-app-web.yaml index 9dbb4dd..87efdd8 100644 --- a/nynja-app/nynja-app-web.yaml +++ b/nynja-app/nynja-app-web.yaml @@ -13,7 +13,7 @@ spec: sealedSecret: "AgB1U6XCWIIhXPxZ1VqYUQN0uPwtwCfSVw8/LeV1z9noSalqmSi4a5SW4aRHE71RMN6uDHoPQp6lbMqxxAt8Ze9K5iRlg91cJoFRso7IvF9iG8W/O3HpWCdcdigSz9yiG7H5KR2ZfnOpqNUtObejzSFxlfewzOyQz5h/rbDImLiB+9S7mbpdVCINDTSkW3gNUv30jRtM/gvcKYTZAkup5SvRRSLI9/xsRi6JrPU8yvMd5nPqAIe+hIUqBwIcTwPBRf+chqjU+7kcSsZNIhNITCcUmpRT/ykl/u/fW8DQ/a1NYhFrnZRCxR/pAwk9NJH0b9jWrf4ieZz9/icia0mTu39+AK1j2zcBBSmCsnNJVXkgeOJd1qJ1U1E7h32+q6tTSDy1oma0avAArRPbyFr11BXXYMAOENlPiSQh1qeHirXlc/3QMnIVKQ9HKI23S1qS7BkdAgky8ChFQ6XBwJJF/pejdSw6b6ZMcgs8GFcPayp0VkjucX98S0CbUK10N77iyEpxDlcYyt15+bIZiQlVARV9Fyd4S6L//FwiBn5QHO/foVIK2tnL7xuQy8cLN4x2JEBI1Y24HjpbIHUL6lkPGqs5mY2qOGACaze4WJ5IhT4tTvs76XyzmLnYUECB7+DIPu2Hks9wCyou7NPNiASBptPGRL9c1RJqow8ZORNOv0nvTkJrVO3jl7wsN8HzEMyGYdSJfXzkIDNUmIhlhgvOY9WeB1ZXUW+xawXqADAC/bpfTYUjziv2J0CkVrb25w==" image: repository: eu.gcr.io/nynja-ci-201610/nynja-app/nynja-app-web - tag: master-26 + tag: master-27 gateway: selector: - api-gateway.default.svc.cluster.local -- GitLab From 7ee23736fa58128141d29a765c66df291e1444e5 Mon Sep 17 00:00:00 2001 From: Nynja CI Date: Thu, 20 Dec 2018 17:41:13 +0000 Subject: [PATCH 15/46] Updated nynja-app-web tag to master-28 --- nynja-app/nynja-app-web.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nynja-app/nynja-app-web.yaml b/nynja-app/nynja-app-web.yaml index 87efdd8..d4f8654 100644 --- a/nynja-app/nynja-app-web.yaml +++ b/nynja-app/nynja-app-web.yaml @@ -13,7 +13,7 @@ spec: sealedSecret: "AgB1U6XCWIIhXPxZ1VqYUQN0uPwtwCfSVw8/LeV1z9noSalqmSi4a5SW4aRHE71RMN6uDHoPQp6lbMqxxAt8Ze9K5iRlg91cJoFRso7IvF9iG8W/O3HpWCdcdigSz9yiG7H5KR2ZfnOpqNUtObejzSFxlfewzOyQz5h/rbDImLiB+9S7mbpdVCINDTSkW3gNUv30jRtM/gvcKYTZAkup5SvRRSLI9/xsRi6JrPU8yvMd5nPqAIe+hIUqBwIcTwPBRf+chqjU+7kcSsZNIhNITCcUmpRT/ykl/u/fW8DQ/a1NYhFrnZRCxR/pAwk9NJH0b9jWrf4ieZz9/icia0mTu39+AK1j2zcBBSmCsnNJVXkgeOJd1qJ1U1E7h32+q6tTSDy1oma0avAArRPbyFr11BXXYMAOENlPiSQh1qeHirXlc/3QMnIVKQ9HKI23S1qS7BkdAgky8ChFQ6XBwJJF/pejdSw6b6ZMcgs8GFcPayp0VkjucX98S0CbUK10N77iyEpxDlcYyt15+bIZiQlVARV9Fyd4S6L//FwiBn5QHO/foVIK2tnL7xuQy8cLN4x2JEBI1Y24HjpbIHUL6lkPGqs5mY2qOGACaze4WJ5IhT4tTvs76XyzmLnYUECB7+DIPu2Hks9wCyou7NPNiASBptPGRL9c1RJqow8ZORNOv0nvTkJrVO3jl7wsN8HzEMyGYdSJfXzkIDNUmIhlhgvOY9WeB1ZXUW+xawXqADAC/bpfTYUjziv2J0CkVrb25w==" image: repository: eu.gcr.io/nynja-ci-201610/nynja-app/nynja-app-web - tag: master-27 + tag: master-28 gateway: selector: - api-gateway.default.svc.cluster.local -- GitLab From a0232aa374ab1027b90461ba079b1406151c3244 Mon Sep 17 00:00:00 2001 From: Nynja CI Date: Fri, 21 Dec 2018 14:32:55 +0000 Subject: [PATCH 16/46] Updated nynja-app-web tag to master-29 --- nynja-app/nynja-app-web.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nynja-app/nynja-app-web.yaml b/nynja-app/nynja-app-web.yaml index d4f8654..62985e3 100644 --- a/nynja-app/nynja-app-web.yaml +++ b/nynja-app/nynja-app-web.yaml @@ -13,7 +13,7 @@ spec: sealedSecret: "AgB1U6XCWIIhXPxZ1VqYUQN0uPwtwCfSVw8/LeV1z9noSalqmSi4a5SW4aRHE71RMN6uDHoPQp6lbMqxxAt8Ze9K5iRlg91cJoFRso7IvF9iG8W/O3HpWCdcdigSz9yiG7H5KR2ZfnOpqNUtObejzSFxlfewzOyQz5h/rbDImLiB+9S7mbpdVCINDTSkW3gNUv30jRtM/gvcKYTZAkup5SvRRSLI9/xsRi6JrPU8yvMd5nPqAIe+hIUqBwIcTwPBRf+chqjU+7kcSsZNIhNITCcUmpRT/ykl/u/fW8DQ/a1NYhFrnZRCxR/pAwk9NJH0b9jWrf4ieZz9/icia0mTu39+AK1j2zcBBSmCsnNJVXkgeOJd1qJ1U1E7h32+q6tTSDy1oma0avAArRPbyFr11BXXYMAOENlPiSQh1qeHirXlc/3QMnIVKQ9HKI23S1qS7BkdAgky8ChFQ6XBwJJF/pejdSw6b6ZMcgs8GFcPayp0VkjucX98S0CbUK10N77iyEpxDlcYyt15+bIZiQlVARV9Fyd4S6L//FwiBn5QHO/foVIK2tnL7xuQy8cLN4x2JEBI1Y24HjpbIHUL6lkPGqs5mY2qOGACaze4WJ5IhT4tTvs76XyzmLnYUECB7+DIPu2Hks9wCyou7NPNiASBptPGRL9c1RJqow8ZORNOv0nvTkJrVO3jl7wsN8HzEMyGYdSJfXzkIDNUmIhlhgvOY9WeB1ZXUW+xawXqADAC/bpfTYUjziv2J0CkVrb25w==" image: repository: eu.gcr.io/nynja-ci-201610/nynja-app/nynja-app-web - tag: master-28 + tag: master-29 gateway: selector: - api-gateway.default.svc.cluster.local -- GitLab From 433fe7f79299f1757f0d707c3efdfa31e694e2e9 Mon Sep 17 00:00:00 2001 From: Nynja CI Date: Fri, 21 Dec 2018 15:52:09 +0000 Subject: [PATCH 17/46] Updated nynja-app-web tag to master-30 --- nynja-app/nynja-app-web.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nynja-app/nynja-app-web.yaml b/nynja-app/nynja-app-web.yaml index 62985e3..a735ae6 100644 --- a/nynja-app/nynja-app-web.yaml +++ b/nynja-app/nynja-app-web.yaml @@ -13,7 +13,7 @@ spec: sealedSecret: "AgB1U6XCWIIhXPxZ1VqYUQN0uPwtwCfSVw8/LeV1z9noSalqmSi4a5SW4aRHE71RMN6uDHoPQp6lbMqxxAt8Ze9K5iRlg91cJoFRso7IvF9iG8W/O3HpWCdcdigSz9yiG7H5KR2ZfnOpqNUtObejzSFxlfewzOyQz5h/rbDImLiB+9S7mbpdVCINDTSkW3gNUv30jRtM/gvcKYTZAkup5SvRRSLI9/xsRi6JrPU8yvMd5nPqAIe+hIUqBwIcTwPBRf+chqjU+7kcSsZNIhNITCcUmpRT/ykl/u/fW8DQ/a1NYhFrnZRCxR/pAwk9NJH0b9jWrf4ieZz9/icia0mTu39+AK1j2zcBBSmCsnNJVXkgeOJd1qJ1U1E7h32+q6tTSDy1oma0avAArRPbyFr11BXXYMAOENlPiSQh1qeHirXlc/3QMnIVKQ9HKI23S1qS7BkdAgky8ChFQ6XBwJJF/pejdSw6b6ZMcgs8GFcPayp0VkjucX98S0CbUK10N77iyEpxDlcYyt15+bIZiQlVARV9Fyd4S6L//FwiBn5QHO/foVIK2tnL7xuQy8cLN4x2JEBI1Y24HjpbIHUL6lkPGqs5mY2qOGACaze4WJ5IhT4tTvs76XyzmLnYUECB7+DIPu2Hks9wCyou7NPNiASBptPGRL9c1RJqow8ZORNOv0nvTkJrVO3jl7wsN8HzEMyGYdSJfXzkIDNUmIhlhgvOY9WeB1ZXUW+xawXqADAC/bpfTYUjziv2J0CkVrb25w==" image: repository: eu.gcr.io/nynja-ci-201610/nynja-app/nynja-app-web - tag: master-29 + tag: master-30 gateway: selector: - api-gateway.default.svc.cluster.local -- GitLab From a50d3d8a537e275ba272421ec2ad6538890a617b Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Fri, 28 Dec 2018 13:21:56 +0200 Subject: [PATCH 18/46] All changes for "Grafana" - already approved in the Helm chart. --- monitoring/grafana.yaml | 100 ++++++++++++++++++++++++++-------------- 1 file changed, 65 insertions(+), 35 deletions(-) diff --git a/monitoring/grafana.yaml b/monitoring/grafana.yaml index 5ad0aaf..f086f8d 100644 --- a/monitoring/grafana.yaml +++ b/monitoring/grafana.yaml @@ -12,27 +12,51 @@ spec: serviceAccount: create: true name: + replicas: 1 + deploymentStrategy: RollingUpdate + + readinessProbe: + httpGet: + path: /api/health + port: 3000 + + livenessProbe: + httpGet: + path: /api/health + port: 3000 + initialDelaySeconds: 60 + timeoutSeconds: 30 + failureThreshold: 10 + image: repository: grafana/grafana - #tag: 5.1.3 - tag: 5.2.4 + tag: 5.3.2 pullPolicy: IfNotPresent + ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ ## # pullSecrets: # - myRegistrKeySecretName + + securityContext: + runAsUser: 472 + fsGroup: 472 + downloadDashboardsImage: repository: appropriate/curl tag: latest pullPolicy: IfNotPresent + ## Pod Annotations # podAnnotations: {} + ## Deployment annotations # annotations: {} + ## Expose the grafana service to be accessed from outside the cluster (LoadBalancer service). ## or access it from within the cluster (ClusterIP service). Set the service type and the port to serve it. ## ref: http://kubernetes.io/docs/user-guide/services/ @@ -47,7 +71,7 @@ spec: nynja.biz/scrape: "true" nynja.biz/scrape_port: "80" nynja.biz/env: "staging" - nynja.biz/probe: "grafana" + nynja.biz/probe: "grafana" labels: {} gateway: selector: @@ -67,25 +91,30 @@ spec: # - secretName: chart-example-tls # hosts: # - chart-example.local + resources: limits: - cpu: 100m - memory: 128Mi + cpu: 400m + memory: 512Mi requests: - cpu: 100m - memory: 128Mi + cpu: 400m + memory: 256Mi + ## Node labels for pod assignment ## ref: https://kubernetes.io/docs/user-guide/node-selection/ # nodeSelector: {} + ## Tolerations for pod assignment ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ ## tolerations: [] + ## Affinity for pod assignment ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity ## affinity: {} + ## Enable persistence using Persistent Volume Claims ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ ## @@ -108,11 +137,14 @@ spec: ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ ## # schedulerName: + ## Extra environment variables that will be pass onto deployment pods env: {} + ## The name of a secret in the same kubernetes namespace which contain values to be added to the environment ## This can be useful for auth tokens, etc envFromSecret: "" + ## Additional grafana server secret mounts # Defines additional mounts with secrets. Secrets must be manually created in the namespace. extraSecretMounts: [] @@ -120,21 +152,15 @@ spec: # mountPath: /etc/secrets # secretName: grafana-secret-files # readOnly: true + # Pass the plugins you want installed as a comma separated list. # plugins: "digrich-bubblechart-panel,grafana-clock-panel" plugins: "" + ## Configure grafana datasources ## ref: http://docs.grafana.org/administration/provisioning/#datasources ## - #datasources: {} - # datasources.yaml: - # apiVersion: 1 - # datasources: - # - name: Prometheus - # type: prometheus - # url: http://prometheus-prometheus-server - # access: proxy - # isDefault: true + datasources: datasources.yaml: apiVersion: 1 @@ -145,23 +171,17 @@ spec: url: http://prometheus-server.monitoring.svc.cluster.local access: proxy isDefault: true + basicAuth: false + isDefault: true + version: 1 + org_id: 1 + ## Configure grafana dashboard providers ## ref: http://docs.grafana.org/administration/provisioning/#dashboards ## ## `path` must be /var/lib/grafana/dashboards/ ## - #dashboardProviders: {} - # dashboardproviders.yaml: - # apiVersion: 1 - # providers: - # - name: 'default' - # orgId: 1 - # folder: '' - # type: file - # disableDeletion: false - # editable: true - # options: - # path: /var/lib/grafana/default/dashboards + dashboardProviders: dashboardproviders.yaml: apiVersion: 1 @@ -174,12 +194,14 @@ spec: editable: true options: path: /var/lib/grafana/dashboards + ## Configure grafana dashboard to import ## NOTE: To use dashboards you must also enable/configure dashboardProviders ## ref: https://grafana.com/dashboards ## ## dashboards per provider, use provider name as key. ## + dashboards: {} # default: # some-dashboard: @@ -191,6 +213,9 @@ spec: # datasource: Prometheus # local-dashboard: # url: https://example.com/repository/test.json + + + ## Reference to external ConfigMap per provider. Use provider name as key and ConfiMap name as value. ## A provider dashboards must be defined either by external ConfigMaps or in values.yaml, not in both. ## ConfigMap data example: @@ -203,6 +228,7 @@ spec: # default: "" dashboardsConfigMaps: default: all-dashboards + ## Grafana's primary configuration ## NOTE: values in map will be converted to ini format ## ref: http://docs.grafana.org/installation/configuration/ @@ -225,6 +251,7 @@ spec: # enabled: true # allow_sign_up: true # config_file: /etc/grafana/ldap.toml + ## Grafana's LDAP configuration ## Templated by the template in _helpers.tpl ## NOTE: To enable the grafana.ini must be configured with auth.ldap.enabled @@ -238,6 +265,7 @@ spec: config: "" # config: |- # verbose_logging = true + # [[servers]] # host = "my-ldap-server" # port = 636 @@ -245,6 +273,7 @@ spec: # start_tls = false # ssl_skip_verify = false # bind_dn = "uid=%s,ou=users,dc=myorg,dc=com" + ## Grafana's SMTP configuration ## NOTE: To enable, grafana.ini must be configured with smtp.enabled ## ref: http://docs.grafana.org/installation/configuration/#smtp @@ -252,18 +281,19 @@ spec: # `existingSecret` is a reference to an existing secret containing the smtp configuration # for Grafana in keys `user` and `password`. existingSecret: "" + ## Sidecars that collect the configmaps with specified label and stores the included files them into the respective folders ## Requires at least Grafana 5 to work and can't be used together with parameters dashboardProviders, datasources and dashboards sidecar: image: kiwigrid/k8s-sidecar:0.0.3 imagePullPolicy: IfNotPresent resources: - # limits: - # cpu: 100m - # memory: 100Mi - # requests: - # cpu: 50m - # memory: 50Mi + limits: + cpu: 200m + memory: 256Mi + requests: + cpu: 100m + memory: 128Mi dashboards: enabled: false # label that the configmaps with dashboards are marked with @@ -273,4 +303,4 @@ spec: datasources: enabled: false # label that the configmaps with datasources are marked with - label: grafana_datasource \ No newline at end of file + label: grafana_datasource -- GitLab From 6203aedd5d7e017ba376686d6123978fec5ae709 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Fri, 28 Dec 2018 19:14:48 +0200 Subject: [PATCH 19/46] Prometheus - New Features: (1) ability to define 'scrape_configs' per environment (easily can be diversified to include such ability for the 'rules'); (2) ability to add label 'env' to all monitored resources. --- monitoring/prometheus.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index 22ef88b..95e2825 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -8,6 +8,10 @@ spec: values: rbac: create: true + + ## Define the NYNJA Group's current environment + nynja_env: 'stg' + ## Define serviceAccount names for components. Defaults to component's fully qualified name. ## serviceAccounts: -- GitLab From b63d4e64ecddcc7723be23250c24e872c4ea09fd Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Fri, 28 Dec 2018 19:25:49 +0200 Subject: [PATCH 20/46] Prometheus - Redeployed: (2) ability to add label 'env' to all monitored resources. --- monitoring/prometheus.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index 95e2825..e09313f 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -10,6 +10,7 @@ spec: create: true ## Define the NYNJA Group's current environment + # nynja_env: 'stg' ## Define serviceAccount names for components. Defaults to component's fully qualified name. -- GitLab From 06532fd25041b1d36688dc67d4b92836c113a8c0 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Sat, 29 Dec 2018 16:55:05 +0200 Subject: [PATCH 21/46] Prometheus - New Feature: (1) Receive a notification on issue resolution; (2) Change the icon - depending on the resolution status of an issue. --- monitoring/prometheus.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index e09313f..6bc79b5 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -731,7 +731,7 @@ spec: slack_configs: - channel: '#ops-alerts-staging' - send_resolved: false + send_resolved: true username: '{{ template "slack.default.username" . }}' color: '{{ if eq .Status "firing" }}danger{{ else }}good{{ end }}' title: '{{ template "slack.default.title" . }}' -- GitLab From ba806fb1320106b8078f313c90afd99f5ad71586 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Mon, 31 Dec 2018 00:53:33 +0200 Subject: [PATCH 22/46] Prometheus - New Features: (1) Significantly improved content, look & feel of the notifications; (2) all components - upgraded to the latest versions; (3) CPU and memory limits tweaks. --- monitoring/prometheus.yaml | 68 ++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 28 deletions(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index 6bc79b5..0114adc 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -169,10 +169,10 @@ spec: resources: limits: cpu: 50m - memory: 160Mi + memory: 192Mi requests: - cpu: 10m - memory: 32Mi + cpu: 30m + memory: 96Mi ## Security context to be added to alertmanager pods ## securityContext: {} @@ -233,8 +233,8 @@ spec: cpu: 100m memory: 320Mi requests: - cpu: 20m - memory: 64Mi + cpu: 25m + memory: 96Mi initChownData: ## If false, data ownership will not be reset at startup ## This allows the prometheus-server to be run with an arbitrary user @@ -258,8 +258,8 @@ spec: cpu: 75m memory: 320Mi requests: - cpu: 20m - memory: 64Mi + cpu: 25m + memory: 96Mi kubeStateMetrics: ## If false, kube-state-metrics will not be installed ## @@ -302,8 +302,8 @@ spec: cpu: 150m memory: 480Mi requests: - cpu: 30m - memory: 48Mi + cpu: 50m + memory: 128Mi ## Security context to be added to kube-state-metrics pods ## securityContext: {} @@ -333,7 +333,7 @@ spec: ## image: repository: prom/node-exporter - tag: v0.16.0 + tag: v0.17.0 pullPolicy: IfNotPresent ## Custom Update Strategy ## @@ -381,8 +381,8 @@ spec: cpu: 200m memory: 300Mi requests: - cpu: 40m - memory: 64Mi + cpu: 50m + memory: 128Mi ## Security context to be added to node-exporter pods ## securityContext: {} @@ -411,7 +411,7 @@ spec: ## image: repository: prom/prometheus - tag: v2.5.0 + tag: v2.6.0 pullPolicy: IfNotPresent ## The URL prefix at which the container can be accessed. Useful in the case the '-web.external-url' includes a slug ## so that the various internal URLs are still able to access as they are in the default case. @@ -556,10 +556,10 @@ spec: resources: limits: cpu: 1250m - memory: 4Gi + memory: 6Gi requests: cpu: 750m - memory: 2Gi + memory: 3Gi ## Security context to be added to server pods ## @@ -622,7 +622,7 @@ spec: ## image: repository: prom/pushgateway - tag: v0.5.2 + tag: v0.6.0 pullPolicy: IfNotPresent ## Additional pushgateway container arguments ## @@ -673,8 +673,8 @@ spec: cpu: 100m memory: 320Mi requests: - cpu: 20m - memory: 64Mi + cpu: 30m + memory: 128Mi ## Security context to be added to push-gateway pods ## securityContext: {} @@ -722,6 +722,25 @@ spec: {{ define "slack.default.text" }}{{ end }} {{ define "slack.default.footer" }}{{ end }} + {{ define "__single_message_title" }}{{ range .Alerts.Firing }}{{ .Labels.alertname }}{{ end }}{{ range .Alerts.Resolved }}{{ .Labels.alertname }}{{ end }}{{ end }} + + {{ define "custom_title" }}[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ if or (and (eq (len .Alerts.Firing) 1) (eq (len .Alerts.Resolved) 0)) (and (eq (len .Alerts.Firing) 0) (eq (len .Alerts.Resolved) 1)) }}{{ template "__single_message_title" . }}{{ end }}{{ end }} + + {{ define "custom_slack_message" }} + {{ if or (and (eq (len .Alerts.Firing) 1) (eq (len .Alerts.Resolved) 0)) (and (eq (len .Alerts.Firing) 0) (eq (len .Alerts.Resolved) 1)) }} + {{ range .Alerts.Firing }}• {{ .Annotations.identifier }}{{ .Annotations.description }}{{ end }}{{ range .Alerts.Resolved }}• {{ .Annotations.identifier }}{{ .Annotations.description }}{{ end }} + {{ else }} + {{ if gt (len .Alerts.Firing) 0 }} + *Alerts Firing: {{ .Labels.alertname }}* + {{ range .Alerts.Firing }}• {{ .Annotations.identifier }}: {{ .Annotations.description }} + {{ end }}{{ end }} + {{ if gt (len .Alerts.Resolved) 0 }} + *Alerts Resolved: {{ .Labels.alertname }}* + {{ range .Alerts.Resolved }}• {{ .Annotations.identifier }}: {{ .Annotations.description }} + {{ end }}{{ end }} + {{ end }} + {{ end }} + alertmanager.yml: global: slack_api_url: ___ALERTMANAGER_SLACK_API_URL___ @@ -734,20 +753,13 @@ spec: send_resolved: true username: '{{ template "slack.default.username" . }}' color: '{{ if eq .Status "firing" }}danger{{ else }}good{{ end }}' - title: '{{ template "slack.default.title" . }}' + title: '{{ template "custom_title" . }}' title_link: '{{ template "slack.default.titlelink" . }}' pretext: '{{ .CommonAnnotations.summary }}' - text: |- - {{ range .Alerts }} - *Alert:* {{ .Annotations.summary }} - `{{ .Labels.severity }}` - *Description:* {{ .Annotations.description }} - *Details:* - {{ range .Labels.SortedPairs }} • *{{ .Name }}:* `{{ .Value }}` - {{ end }} - {{ end }} + text: '{{ template "custom_slack_message" . }}' fallback: '{{ template "slack.default.fallback" . }}' icon_emoji: '{{ template "slack.default.iconemoji" . }}' - icon_url: '{{ template "slack.default.iconurl" . }}' + icon_url: '{{ if eq .Status "firing" }}https://raw.githubusercontent.com/BulprosMiroslavHadzhiev/prometheus-icons/master/firing.png{{ else }}https://raw.githubusercontent.com/BulprosMiroslavHadzhiev/prometheus-icons/master/resolved.png{{ end }}' pagerduty_configs: - service_key: ___PAGERDUTY_SERVICEKEY___ -- GitLab From f6da1526159ac41ca5387cca353ae08bb8805c46 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Mon, 31 Dec 2018 01:26:45 +0200 Subject: [PATCH 23/46] Prometheus - New Features: (1) Significantly improved content, look & feel of the notifications; (2) all components - upgraded to the latest versions; (3) CPU and memory limits tweaks. --- monitoring/prometheus.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index 0114adc..67a467a 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -14,7 +14,7 @@ spec: nynja_env: 'stg' ## Define serviceAccount names for components. Defaults to component's fully qualified name. - ## + # serviceAccounts: alertmanager: create: true -- GitLab From a5b129ad58eefdf3e752c13d9d98ec363090eeb9 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Mon, 31 Dec 2018 10:51:55 +0200 Subject: [PATCH 24/46] Prometheus - New Features: (1) Significantly improved content, look & feel of the notifications; (2) all components - upgraded to the latest versions; (3) CPU and memory limits tweaks. --- monitoring/grafana.yaml | 2 +- monitoring/prometheus.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/monitoring/grafana.yaml b/monitoring/grafana.yaml index f086f8d..e8bedcf 100644 --- a/monitoring/grafana.yaml +++ b/monitoring/grafana.yaml @@ -60,7 +60,7 @@ spec: ## Expose the grafana service to be accessed from outside the cluster (LoadBalancer service). ## or access it from within the cluster (ClusterIP service). Set the service type and the port to serve it. ## ref: http://kubernetes.io/docs/user-guide/services/ - ## + # service: type: ClusterIP #type: LoadBalancer diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index 67a467a..d747936 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -33,7 +33,7 @@ spec: name: alertmanager: ## If false, alertmanager will not be installed - ## + # enabled: true ## alertmanager container name ## -- GitLab From 17a1b45caa6bcce887e3c9a496909ff1223b9b49 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Mon, 31 Dec 2018 11:42:41 +0200 Subject: [PATCH 25/46] Prometheus - Fixed Bugs: (1) No notifications were received when multiple alerts needed to be sent at once. --- monitoring/prometheus.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index d747936..20b54a1 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -731,12 +731,12 @@ spec: {{ range .Alerts.Firing }}• {{ .Annotations.identifier }}{{ .Annotations.description }}{{ end }}{{ range .Alerts.Resolved }}• {{ .Annotations.identifier }}{{ .Annotations.description }}{{ end }} {{ else }} {{ if gt (len .Alerts.Firing) 0 }} - *Alerts Firing: {{ .Labels.alertname }}* - {{ range .Alerts.Firing }}• {{ .Annotations.identifier }}: {{ .Annotations.description }} + *Alerts Firing:* {{ range .Alerts.Firing }}{{ .Labels.alertname }} + • {{ .Annotations.identifier }}: {{ .Annotations.description }} {{ end }}{{ end }} {{ if gt (len .Alerts.Resolved) 0 }} - *Alerts Resolved: {{ .Labels.alertname }}* - {{ range .Alerts.Resolved }}• {{ .Annotations.identifier }}: {{ .Annotations.description }} + *Alerts Resolved:* {{ range .Alerts.Firing }}{{ .Labels.alertname }} + • {{ .Annotations.identifier }}: {{ .Annotations.description }} {{ end }}{{ end }} {{ end }} {{ end }} -- GitLab From 3c9c25ec14c04b0bd07cb979691d4af5a5b84813 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Mon, 31 Dec 2018 15:49:26 +0200 Subject: [PATCH 26/46] Prometheus - Fixed Bugs: (1) No notifications were received when multiple alerts needed to be sent at once. --- monitoring/prometheus.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index 20b54a1..0cfef75 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -731,11 +731,13 @@ spec: {{ range .Alerts.Firing }}• {{ .Annotations.identifier }}{{ .Annotations.description }}{{ end }}{{ range .Alerts.Resolved }}• {{ .Annotations.identifier }}{{ .Annotations.description }}{{ end }} {{ else }} {{ if gt (len .Alerts.Firing) 0 }} - *Alerts Firing:* {{ range .Alerts.Firing }}{{ .Labels.alertname }} + *Alerts Firing:* + {{ range .Alerts.Firing }} • {{ .Annotations.identifier }}: {{ .Annotations.description }} {{ end }}{{ end }} {{ if gt (len .Alerts.Resolved) 0 }} - *Alerts Resolved:* {{ range .Alerts.Firing }}{{ .Labels.alertname }} + *Alerts Resolved:* + {{ range .Alerts.Firing }} • {{ .Annotations.identifier }}: {{ .Annotations.description }} {{ end }}{{ end }} {{ end }} -- GitLab From 10234bea99aade511d372d78473571ac3abb4a39 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Tue, 1 Jan 2019 19:15:04 +0200 Subject: [PATCH 27/46] Prometheus - Fixed Bugs: (1) Only "FIRING" notifications were received when multiple alerts needed to be sent at once - now should also the "RESOLVED" ones. --- monitoring/prometheus.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index 0cfef75..e33d76f 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -737,7 +737,7 @@ spec: {{ end }}{{ end }} {{ if gt (len .Alerts.Resolved) 0 }} *Alerts Resolved:* - {{ range .Alerts.Firing }} + {{ range .Alerts.Resolved }} • {{ .Annotations.identifier }}: {{ .Annotations.description }} {{ end }}{{ end }} {{ end }} -- GitLab From e2db34e8d0b232a560f947375c3254fc88c5e57c Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Wed, 2 Jan 2019 10:47:48 +0200 Subject: [PATCH 28/46] Prometheus - Fixed Bugs: (1)"FIRING" and "RESOLVED" notifications are properly received when multiple alerts needed to be sent at once - and they included ones of both types. --- monitoring/prometheus.yaml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index e33d76f..6ee72f0 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -722,23 +722,21 @@ spec: {{ define "slack.default.text" }}{{ end }} {{ define "slack.default.footer" }}{{ end }} - {{ define "__single_message_title" }}{{ range .Alerts.Firing }}{{ .Labels.alertname }}{{ end }}{{ range .Alerts.Resolved }}{{ .Labels.alertname }}{{ end }}{{ end }} + {{ define "__single_message_title" }}[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ else }}{{ .Alerts.Resolved | len }}{{ end }}] {{ range .Alerts.Firing }}{{ .Labels.alertname }}{{ end }}{{ range .Alerts.Resolved }}{{ .Labels.alertname }}{{ end }}{{ end }} - {{ define "custom_title" }}[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ end }}] {{ if or (and (eq (len .Alerts.Firing) 1) (eq (len .Alerts.Resolved) 0)) (and (eq (len .Alerts.Firing) 0) (eq (len .Alerts.Resolved) 1)) }}{{ template "__single_message_title" . }}{{ end }}{{ end }} + {{ define "custom_title" }} {{ if or (and (eq (len .Alerts.Firing) 1) (eq (len .Alerts.Resolved) 0)) (and (eq (len .Alerts.Firing) 0) (eq (len .Alerts.Resolved) 1)) }}{{ template "__single_message_title" . }}{{ end }}{{ end }} {{ define "custom_slack_message" }} {{ if or (and (eq (len .Alerts.Firing) 1) (eq (len .Alerts.Resolved) 0)) (and (eq (len .Alerts.Firing) 0) (eq (len .Alerts.Resolved) 1)) }} - {{ range .Alerts.Firing }}• {{ .Annotations.identifier }}{{ .Annotations.description }}{{ end }}{{ range .Alerts.Resolved }}• {{ .Annotations.identifier }}{{ .Annotations.description }}{{ end }} + {{ range .Alerts.Firing }}• {{ .Annotations.identifier }} *-* {{ .Annotations.description }}{{ end }}{{ range .Alerts.Resolved }}• {{ .Annotations.identifier }} *-* {{ .Annotations.description }}{{ end }} {{ else }} {{ if gt (len .Alerts.Firing) 0 }} - *Alerts Firing:* - {{ range .Alerts.Firing }} - • {{ .Annotations.identifier }}: {{ .Annotations.description }} + *[FIRING:{{ .Alerts.Firing | len }}]* + {{ range .Alerts.Firing }}• {{ .Annotations.identifier }} *-* {{ .Annotations.description }} {{ end }}{{ end }} {{ if gt (len .Alerts.Resolved) 0 }} - *Alerts Resolved:* - {{ range .Alerts.Resolved }} - • {{ .Annotations.identifier }}: {{ .Annotations.description }} + *[RESOLVED:{{ .Alerts.Resolved | len }}]* + {{ range .Alerts.Resolved }}• {{ .Annotations.identifier }} *-* {{ .Annotations.description }} {{ end }}{{ end }} {{ end }} {{ end }} -- GitLab From f73d15f764d53411af68e52cfdcd397b6b41ea07 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Wed, 2 Jan 2019 11:07:11 +0200 Subject: [PATCH 29/46] Prometheus - Fixed Bugs: (1)"FIRING" and "RESOLVED" notifications are properly received when multiple alerts needed to be sent at once - and they included ones of both types. --- monitoring/prometheus.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index 6ee72f0..9dc597a 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -36,7 +36,7 @@ spec: # enabled: true ## alertmanager container name - ## + # name: alertmanager ## alertmanager container image ## -- GitLab From 49d453a5b6a072a7f81d523e8eb040881468ddbc Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Wed, 2 Jan 2019 11:44:11 +0200 Subject: [PATCH 30/46] Prometheus - Fixed Bugs: (1) Use the same design of notifications regardless of multiple or single alerts are sent. --- monitoring/prometheus.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index 9dc597a..01c80c6 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -36,7 +36,7 @@ spec: # enabled: true ## alertmanager container name - # + ## name: alertmanager ## alertmanager container image ## @@ -722,7 +722,7 @@ spec: {{ define "slack.default.text" }}{{ end }} {{ define "slack.default.footer" }}{{ end }} - {{ define "__single_message_title" }}[{{ .Status | toUpper }}{{ if eq .Status "firing" }}:{{ .Alerts.Firing | len }}{{ else }}{{ .Alerts.Resolved | len }}{{ end }}] {{ range .Alerts.Firing }}{{ .Labels.alertname }}{{ end }}{{ range .Alerts.Resolved }}{{ .Labels.alertname }}{{ end }}{{ end }} + {{ define "__single_message_title" }}[{{ .Status | toUpper }}:{{ if eq .Status "firing" }}{{ .Alerts.Firing | len }}{{ else }}{{ .Alerts.Resolved | len }}{{ end }}]{{ end }} {{ define "custom_title" }} {{ if or (and (eq (len .Alerts.Firing) 1) (eq (len .Alerts.Resolved) 0)) (and (eq (len .Alerts.Firing) 0) (eq (len .Alerts.Resolved) 1)) }}{{ template "__single_message_title" . }}{{ end }}{{ end }} -- GitLab From a6791f09b8ed9421e228321cddab3f72ffc0ea81 Mon Sep 17 00:00:00 2001 From: Nynja CI Date: Wed, 2 Jan 2019 13:42:36 +0000 Subject: [PATCH 31/46] Updated nynja-app-web tag to master-34 --- nynja-app/nynja-app-web.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nynja-app/nynja-app-web.yaml b/nynja-app/nynja-app-web.yaml index a735ae6..2ba6efa 100644 --- a/nynja-app/nynja-app-web.yaml +++ b/nynja-app/nynja-app-web.yaml @@ -13,7 +13,7 @@ spec: sealedSecret: "AgB1U6XCWIIhXPxZ1VqYUQN0uPwtwCfSVw8/LeV1z9noSalqmSi4a5SW4aRHE71RMN6uDHoPQp6lbMqxxAt8Ze9K5iRlg91cJoFRso7IvF9iG8W/O3HpWCdcdigSz9yiG7H5KR2ZfnOpqNUtObejzSFxlfewzOyQz5h/rbDImLiB+9S7mbpdVCINDTSkW3gNUv30jRtM/gvcKYTZAkup5SvRRSLI9/xsRi6JrPU8yvMd5nPqAIe+hIUqBwIcTwPBRf+chqjU+7kcSsZNIhNITCcUmpRT/ykl/u/fW8DQ/a1NYhFrnZRCxR/pAwk9NJH0b9jWrf4ieZz9/icia0mTu39+AK1j2zcBBSmCsnNJVXkgeOJd1qJ1U1E7h32+q6tTSDy1oma0avAArRPbyFr11BXXYMAOENlPiSQh1qeHirXlc/3QMnIVKQ9HKI23S1qS7BkdAgky8ChFQ6XBwJJF/pejdSw6b6ZMcgs8GFcPayp0VkjucX98S0CbUK10N77iyEpxDlcYyt15+bIZiQlVARV9Fyd4S6L//FwiBn5QHO/foVIK2tnL7xuQy8cLN4x2JEBI1Y24HjpbIHUL6lkPGqs5mY2qOGACaze4WJ5IhT4tTvs76XyzmLnYUECB7+DIPu2Hks9wCyou7NPNiASBptPGRL9c1RJqow8ZORNOv0nvTkJrVO3jl7wsN8HzEMyGYdSJfXzkIDNUmIhlhgvOY9WeB1ZXUW+xawXqADAC/bpfTYUjziv2J0CkVrb25w==" image: repository: eu.gcr.io/nynja-ci-201610/nynja-app/nynja-app-web - tag: master-30 + tag: master-34 gateway: selector: - api-gateway.default.svc.cluster.local -- GitLab From 0f2c6eaa5e23ec047f6727ac7b479acd573a8164 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Wed, 2 Jan 2019 21:08:48 +0200 Subject: [PATCH 32/46] Prometheus - Refinement: (1) Alert on Node Memory usage above 90 %. --- monitoring/prometheus.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index 01c80c6..7d72614 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -36,7 +36,7 @@ spec: # enabled: true ## alertmanager container name - ## + # name: alertmanager ## alertmanager container image ## -- GitLab From 7cecffd89941f166706cdeacfa140795e5dda183 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Wed, 2 Jan 2019 22:26:26 +0200 Subject: [PATCH 33/46] Prometheus - Refinement: (1) Bold text for the "Pod" keyword in the "PodFrequentlyRestarting" alert. --- monitoring/prometheus.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index 7d72614..2fb9dd7 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -39,7 +39,7 @@ spec: # name: alertmanager ## alertmanager container image - ## + # image: repository: prom/alertmanager tag: v0.15.3 -- GitLab From 98ad548420a952c4bbe2e2afc5ab02f7f396e90b Mon Sep 17 00:00:00 2001 From: Nynja CI Date: Thu, 3 Jan 2019 10:35:59 +0000 Subject: [PATCH 34/46] Updated nynja-app-web tag to master-35 --- nynja-app/nynja-app-web.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nynja-app/nynja-app-web.yaml b/nynja-app/nynja-app-web.yaml index 2ba6efa..4aa64bd 100644 --- a/nynja-app/nynja-app-web.yaml +++ b/nynja-app/nynja-app-web.yaml @@ -13,7 +13,7 @@ spec: sealedSecret: "AgB1U6XCWIIhXPxZ1VqYUQN0uPwtwCfSVw8/LeV1z9noSalqmSi4a5SW4aRHE71RMN6uDHoPQp6lbMqxxAt8Ze9K5iRlg91cJoFRso7IvF9iG8W/O3HpWCdcdigSz9yiG7H5KR2ZfnOpqNUtObejzSFxlfewzOyQz5h/rbDImLiB+9S7mbpdVCINDTSkW3gNUv30jRtM/gvcKYTZAkup5SvRRSLI9/xsRi6JrPU8yvMd5nPqAIe+hIUqBwIcTwPBRf+chqjU+7kcSsZNIhNITCcUmpRT/ykl/u/fW8DQ/a1NYhFrnZRCxR/pAwk9NJH0b9jWrf4ieZz9/icia0mTu39+AK1j2zcBBSmCsnNJVXkgeOJd1qJ1U1E7h32+q6tTSDy1oma0avAArRPbyFr11BXXYMAOENlPiSQh1qeHirXlc/3QMnIVKQ9HKI23S1qS7BkdAgky8ChFQ6XBwJJF/pejdSw6b6ZMcgs8GFcPayp0VkjucX98S0CbUK10N77iyEpxDlcYyt15+bIZiQlVARV9Fyd4S6L//FwiBn5QHO/foVIK2tnL7xuQy8cLN4x2JEBI1Y24HjpbIHUL6lkPGqs5mY2qOGACaze4WJ5IhT4tTvs76XyzmLnYUECB7+DIPu2Hks9wCyou7NPNiASBptPGRL9c1RJqow8ZORNOv0nvTkJrVO3jl7wsN8HzEMyGYdSJfXzkIDNUmIhlhgvOY9WeB1ZXUW+xawXqADAC/bpfTYUjziv2J0CkVrb25w==" image: repository: eu.gcr.io/nynja-ci-201610/nynja-app/nynja-app-web - tag: master-34 + tag: master-35 gateway: selector: - api-gateway.default.svc.cluster.local -- GitLab From d89faf2b18c4afbd0f5f903701cdc85294d12f92 Mon Sep 17 00:00:00 2001 From: Nynja CI Date: Thu, 3 Jan 2019 11:38:24 +0000 Subject: [PATCH 35/46] Updated nynja-app-web tag to master-36 --- nynja-app/nynja-app-web.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nynja-app/nynja-app-web.yaml b/nynja-app/nynja-app-web.yaml index 4aa64bd..3473700 100644 --- a/nynja-app/nynja-app-web.yaml +++ b/nynja-app/nynja-app-web.yaml @@ -13,7 +13,7 @@ spec: sealedSecret: "AgB1U6XCWIIhXPxZ1VqYUQN0uPwtwCfSVw8/LeV1z9noSalqmSi4a5SW4aRHE71RMN6uDHoPQp6lbMqxxAt8Ze9K5iRlg91cJoFRso7IvF9iG8W/O3HpWCdcdigSz9yiG7H5KR2ZfnOpqNUtObejzSFxlfewzOyQz5h/rbDImLiB+9S7mbpdVCINDTSkW3gNUv30jRtM/gvcKYTZAkup5SvRRSLI9/xsRi6JrPU8yvMd5nPqAIe+hIUqBwIcTwPBRf+chqjU+7kcSsZNIhNITCcUmpRT/ykl/u/fW8DQ/a1NYhFrnZRCxR/pAwk9NJH0b9jWrf4ieZz9/icia0mTu39+AK1j2zcBBSmCsnNJVXkgeOJd1qJ1U1E7h32+q6tTSDy1oma0avAArRPbyFr11BXXYMAOENlPiSQh1qeHirXlc/3QMnIVKQ9HKI23S1qS7BkdAgky8ChFQ6XBwJJF/pejdSw6b6ZMcgs8GFcPayp0VkjucX98S0CbUK10N77iyEpxDlcYyt15+bIZiQlVARV9Fyd4S6L//FwiBn5QHO/foVIK2tnL7xuQy8cLN4x2JEBI1Y24HjpbIHUL6lkPGqs5mY2qOGACaze4WJ5IhT4tTvs76XyzmLnYUECB7+DIPu2Hks9wCyou7NPNiASBptPGRL9c1RJqow8ZORNOv0nvTkJrVO3jl7wsN8HzEMyGYdSJfXzkIDNUmIhlhgvOY9WeB1ZXUW+xawXqADAC/bpfTYUjziv2J0CkVrb25w==" image: repository: eu.gcr.io/nynja-ci-201610/nynja-app/nynja-app-web - tag: master-35 + tag: master-36 gateway: selector: - api-gateway.default.svc.cluster.local -- GitLab From a4852bbdc993cd848b6a902bb36ccbb8ef9f3d35 Mon Sep 17 00:00:00 2001 From: Nynja CI Date: Thu, 3 Jan 2019 14:05:52 +0000 Subject: [PATCH 36/46] Updated account-service tag to master-2 --- account/account-service.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 account/account-service.yaml diff --git a/account/account-service.yaml b/account/account-service.yaml new file mode 100644 index 0000000..6fe386d --- /dev/null +++ b/account/account-service.yaml @@ -0,0 +1,17 @@ +kind: HelmRelease +metadata: + name: account-service + namespace: account +spec: + chart: + name: account-service + values: + replicaCount: 2 + image: + repository: eu.gcr.io/nynja-ci-201610/account/account-service + tag: master-2 + gateway: + selector: + - api-gateway.default.svc.cluster.local + hosts: + - account.staging.nynja.net -- GitLab From 34a77813a6c731028cde102932657ff693fb73ed Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Thu, 3 Jan 2019 18:37:28 +0200 Subject: [PATCH 37/46] Prometheus - Refinement: (1) Use 2-digit float numbers in the current percentage value of the notification - the current restart rate. --- monitoring/prometheus.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index 2fb9dd7..d9c9f1b 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -45,7 +45,7 @@ spec: tag: v0.15.3 pullPolicy: IfNotPresent ## Additional alertmanager container arguments - ## + # extraArgs: {} ## The URL prefix at which the container can be accessed. Useful in the case the '-web.external-url' includes a slug ## so that the various internal URLs are still able to access as they are in the default case. -- GitLab From 8748a2b5b2c74b35af9f123793845c5049c7a6b2 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Thu, 3 Jan 2019 18:57:34 +0200 Subject: [PATCH 38/46] Prometheus - New Features: (1) A new notification: "PodNotReady" - get an alert when a pod is NOT in the states "Running" or "Succeeded". --- monitoring/prometheus.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index d9c9f1b..f56277a 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -56,7 +56,7 @@ spec: baseURL: "/" ## Additional alertmanager container environment variable ## For instance to add a http_proxy - ## + # extraEnv: {} ## ConfigMap override where fullname is {{.Release.Name}}-{{.Values.alertmanager.configMapOverrideName}} ## Defining configMapOverrideName will cause templates/alertmanager-configmap.yaml -- GitLab From cdc9ea90e10c8a2351118bf6de5f04a5b21cb2d0 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Thu, 3 Jan 2019 19:12:35 +0200 Subject: [PATCH 39/46] Prometheus - New Features: (1) A new notification: "PodNotReady" - get an alert when a pod is NOT in the states of "Running" or "Succeeded". --- monitoring/prometheus.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index f56277a..423d1bc 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -61,7 +61,7 @@ spec: ## ConfigMap override where fullname is {{.Release.Name}}-{{.Values.alertmanager.configMapOverrideName}} ## Defining configMapOverrideName will cause templates/alertmanager-configmap.yaml ## to NOT generate a ConfigMap resource - ## + # configMapOverrideName: "" pagerduty: ## If true, PagerDuty will be enabled for Alertmanager -- GitLab From 51871722a6491c73747c78dce21101a4530ab25b Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Thu, 3 Jan 2019 19:25:20 +0200 Subject: [PATCH 40/46] Prometheus - New Features: (1) A new notification: "PodNotReady" - get an alert when a pod is NOT in the states of "Running" or "Succeeded". --- monitoring/prometheus.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index 423d1bc..11eb73f 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -65,7 +65,7 @@ spec: configMapOverrideName: "" pagerduty: ## If true, PagerDuty will be enabled for Alertmanager - ## + # enabled: true ## The sealed PagerDuty Service Key (sealed with Bitnami's SealedSecret) servicekey: "AgAiX+HSlRoh0ljLuQjelMobs5lu6mY5nkbDmfLkIO+4s02GgDAtbNvMRVmKvBvWFCXD/KzkQw+7+ja1IRam5VK85Pi29EpBjdfgQp/sX5fSTrR4ybxjdAeBvHrEirX7RPaX/9RBnb0WJLsJlS6zQ5hYQz/AkNfaCIVKumecsh3Cy2UeOXDGJiW/bPt4veVEN0iUYgnKCZlmr80mCbaAe44IVMHix74BDRA3CbJt8hJDGqC2x8TbElWNq3zAC4rB7Rl5qTsJh4ZNmIJVFCzwc0E3+Z61KBIRs0st2fetlTnT+6L+pODFP5wsC59LRCKWrS2N9Ah24Vxz0iDThJlHLECUpcce33mSYiJ9A/iuAmLAgZcwqz9gtGQC2rl7Xwnq7hCbWHB9TgzYrJbiJLPYsS265yw5R7VBwq3/uCbnEagEtJ+fmfR4iTywFDQt/Iw7jj+rVb2rq1u2IoS5CMOxIN2pYucS2jLvJ4z17NJrKnhNmWc4bWWxneRlLVB7oDPPeIWdl4QjsQ61uGNU8Ok0DHxyqCIQ3yf5p/TaLCfePoo7Xa4BnL87bg1Q0Hr9FFdZy8evIrbbUJIC/9bWFyw3rG/0TGV5rbBiH/2vR4ZEd81StLFMtmcWhU0Le2lazXobdpginlZmQOMRWu8jLTp7VxkJhdi8cAoAk9x9UW/Qp907nVpGcjc5DRKgQD2vBYF09ZVQSbHM6rCpjrmVZK0hmUzd/hHXKkuaIV6wrfJnCSNzFA==" -- GitLab From 7035c0e4f5748f3d2b2c2e9815c97d8012b58956 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Thu, 3 Jan 2019 20:25:39 +0200 Subject: [PATCH 41/46] Prometheus - New Features: (1) A new notification: "PodNotReady" - get an alert when a pod is NOT in the states of "Running" or "Succeeded". --- monitoring/prometheus.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index 11eb73f..e6e53c3 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -81,7 +81,7 @@ spec: ingress: ## If true, alertmanager Ingress will be created - ## + # enabled: false ## alertmanager Ingress annotations ## -- GitLab From ab955d6eba77cf90399de05bb0f54da91312814d Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Thu, 3 Jan 2019 20:51:27 +0200 Subject: [PATCH 42/46] Prometheus - New Features: (1) A new notification: "PodNotReady" - get an alert when a pod is NOT in the states of "Running" or "Succeeded". --- monitoring/prometheus.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index e6e53c3..03bac97 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -84,7 +84,7 @@ spec: # enabled: false ## alertmanager Ingress annotations - ## + # annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: 'true' -- GitLab From 992f5aa04d9e01d20da68a2a4b13a207ba5e4d32 Mon Sep 17 00:00:00 2001 From: Miroslav Hadzhiev Date: Fri, 4 Jan 2019 00:09:59 +0200 Subject: [PATCH 43/46] Prometheus - New Features: (1) A new notification: "PodNotReady" - get an alert when a pod is NOT in the states of "Running" or "Succeeded". --- monitoring/prometheus.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring/prometheus.yaml b/monitoring/prometheus.yaml index 03bac97..da1879c 100644 --- a/monitoring/prometheus.yaml +++ b/monitoring/prometheus.yaml @@ -89,7 +89,7 @@ spec: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: 'true' ## alertmanager Ingress additional labels - ## + # extraLabels: {} ## alertmanager Ingress hostnames with optional path ## Must be provided if Ingress is enabled -- GitLab From 660a3a59b30ed7930b48831dc378ea907dafcadf Mon Sep 17 00:00:00 2001 From: Nynja CI Date: Fri, 4 Jan 2019 07:32:58 +0000 Subject: [PATCH 44/46] Updated auth-service tag to master-2 --- auth/auth-service.yaml | 104 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 auth/auth-service.yaml diff --git a/auth/auth-service.yaml b/auth/auth-service.yaml new file mode 100644 index 0000000..9fc2ab7 --- /dev/null +++ b/auth/auth-service.yaml @@ -0,0 +1,104 @@ +kind: HelmRelease +metadata: + name: auth-service + namespace: auth +spec: + chart: + name: auth-service + values: + replicaCount: 2 + image: + repository: eu.gcr.io/nynja-ci-201610/auth/auth-service + tag: master-2 + gateway: + selector: + - api-gateway.default.svc.cluster.local + hosts: + - auth.staging.nynja.net + + resources: + limits: + cpu: 1 + memory: 1500Mi + requests: + cpu: 500m + memory: 1000Mi + + ports: + containerPort: + http: 8008 + grpc: 6566 + + # Amazon email server configuration. + amazon: + ses: + host: "email-smtp.us-west-2.amazonaws.com" + port: "587" + smtp: + password: "AgCfLEcpKyMwkQpjk6JHzkYM3SWUjd/jIsO40oF8Dj9xACLXHt/lsreW4ng3dwX5mYed4Z5lPOfPm1Fsy2gljyFAkjnaeo9HOSRkWzRN+wdTJNRKZeLqisuT4/32yBv6BgOrdzph1v0IJRmrvHNzpZp/FsHWRjYm9SNI1GRef1iKqP4k2uqIQ5H2+0mDeMYXZSyDkPtQyCtKKQGNTs00etC1V8ExQ6hT//3hFVvEEtQ54obH00kAPGY92mnH6VdYTLSAbuhdD7AXaD7JVpA2zUXU6rThg+dGywM6iXR3SDuflZuzyUgt1npPgxSzfFjUypaMB72jSTFBsgx3YY+RAe++ZWg76SW477lh8r09ig6AG0/JXeslx0ybM606Or21cFkHf5BeaWPotTOvKYYBSeq+B+V6Za1bYTsj/5cZbJU7UImwGOU5qb8z135W9oXaLRZQ4jxIX7/rRcALuyH1ZH9290XOfeGZJM0CAvQt4Xy2Z1/GNje3HrHaBOFARX6XT8wsJCpE0f510bbMM2ncNHAPCGmfigp1sM8zPHr1xRMn+o17jOGQM7Z9zozAu4GsCFJ2wogrAn03KpxnhWtejghxbQQ5QnKYUPw8VbYZ1UvM6sUH8a3sbV53MpZNrvd4yMWJ2jycYGQmjU9og6Da1dUr4Cnh3wMpLp/g/oaETnAkR1my5v1xnSKAmjqWnkiYmeC7MrINJA+NRsQpbDWU6IxxfguQZohd/FEQOZbcmEK+RQcFDUFdd2APu9yRiw==" + username: "AgBocHTeeoQwciFouaJyeIgkJDGGigBj5hATLxVjmgtDabBf3Pzn0RnylO/MKKb6sRtMohvkbgXiLBXtsyvMa1jvFVHdrKcB7vvGKPZNitbuk84La9w2YnRH436jee9pTOLgPDSEGJghRF87KEcSitAit6M631fDiCm54mjgIMw1pioqOq3oa7CH8lhQhotNk65adpcmDJ7rZuS9pgvKUpq4g7Svtz8WCkYayIN7YFTIKyTClsCPJW6+jUGYszoMxZLRlkvNALc2B2DeIu0wSLXIuuGCa0ElgdMOUxVKSTHQY52j9Opja226WumyoBkThwPm64fKR8q9Aebos5Ye9jC2/WAU0syscVcBK0VPjY/5in6wkf34LZfyfgmFd9T/7GsliqVZnGMOuoOiX0VlACjhaHzdsR+/oIGP027NJ8xVawZeyWJ1edKWW7FWz8cIiWqP7H6PSqw+RlDJdcm3pwiyi+8cJqXWJrDDNqVTSU2F28TB51RDxSYuFINn2eH4Y5DkOgyLmrnsPF3JgjKyS8GfWYCSy+Qgw6g8uZSCQoD9LNRKjEbcBjcv4evF5I0Qhb0ObID+gCfxBY076Ws8420dwWZfCPYfYYt7Hh14iItpipLxuMrVK/9c/tknmPqefqxQYqHhnYx7PaW2xtsjEN6LiwAxjpvOi2esb4T4x/h2I8PEmuQspDzz87ELz5RYLIGhBUdOf7bu7+DNSgK+cPWwct8JZQ==" + from: "noreply@nynja.net" + + # Telesign integration. + telesign: + host: "rest-ww.telesign.com" + restEndpoint: "https://rest-ww.telesign.com/" + customerId: "AgCVtLlhx9E20FXjeFOiVVz/0VBh7yrKY5ieNBmm82HOKcSagCDzIqLy5cMCyoP58xaaD6IjvuVdXMso0/w6ccakxCQQVBN16nFCKasQw/QH71HC1glDCO19jM1UfM+RW7RR5m3Mhb75NpPnBv8hFeDBA6uI9J4UZq1asrdTOKOolQj3lWUmYHwtr6fSI9Pwn+9SdjXkNvXrKuG2AVac+PxT/lHJ7R0g4C0jGYcaOeKwFMpGG0LN8vqXoKLv0GAl2a8m/QS0ONUp6zmagJyUjB/wGG3D0N5R/bz5bsMtgYjJH2u9q+27rmYKfoiQhV76CFombtTEqIBGSnRiUN3F70OTImbG//rio25HImJ+FYAheR98mKXl2Mdb76LEqJHikNejW0z3OUgwAY44jyat0EYUNiUnLQ3mq9Q1YG1DiZvXrS19suX/8WraX3JKO/aMBVza919YStZ7y1OkTyf9xcA67YCEqQPzMEZMkBkzs2psxZvHQ58omKD2n50mL9bSC0LVgpjQkTbIotTINZ628UstgQaoej4V8LbT2EYanWZV1HLwAgK241QXWfsVnR+yu6EN+1az3gbOCsyvjTWJrkcqd4lmWhz+ghqiHENVgBagZlCb8iZTUjbEg3fPV9//XAeFIObNVe7J6Z7Smv7mNuOShpyL6ipoZQ5yM1WdVoxZySqQIaXgmQxkAG50b7A8R3/b14WmiwbWnNXCELgKPkET67wnXwyQqNKQ8NNYLJCJreWLGgU=" + apiKey: "AgA7S5hFhBc31y2PUROshw5nUDMksv7fKSvN1yToI2IojeYRxl1sRGTXVDxWWifXsPOvkQGdb32nR4Zms0ZIWbGqRjnJ/N5BQ2Vi/mVBAR+aFKs8ZYfzjK/7nNPJYgOuo9nqn2XeCYcABLuKPwmMZv2m1e6ZPnv88bJNym53+IdI5D3/LGM0WY/7S+S73TD2SDr5u4REgVaEbNVPnBnEddQ0sKAWjaQ9foQi9J7XfOxZiabN5HmiOf5a6JGUi9gk7sIk2LXglMTwsE3Iq31d42lCKG+wGoYDGoLxV95V7E8PhPB5i/qDAbcW+oRPSkaRebdu8hBv6nEqbS70k3hdOUWBDFSyxpOCVp9xTBRsgl2HwmI5nna66Mge74gRfspumWDgMQ14b6ERgHj20sdWuH4W93ura0wlxywgACWEiTPiZkor+YuI7SJNPE9/ezQltVRQoPVgenXVbjsJBe0obttPNmSiTS6Xa+vSnJfGm9XueyLCa+yaW8rZqpm6zFoai8kkXa40es1wl9Co1kC6a09ah3uE7uoVWNBLhteaBbYDRcB1jino9IZiFVK0I8kkjkxXOP0QCBwkCrSKj/1yDFGdgotNZpgY3dKWVXfP4QfViJkRYhzKGW4GoeLbTeDFVy/5+oGOl63XbfYlEz7vlNH4q/EhzE2oSYA/vmXic/Fb6Ek2SULVRdBBkvm9IXWf+C/trFjhqHvRbOzpRh++qdPOwlx/ILYEHX8DrMTf7kZxfihuYtUNaBjFWYneghkUy3eFyfahFgndVIs/YInhlwjTQ6rdD2wMnGa05227n3cfuvp5BRc7iE4p" + # Token validation + token: + ## Auth token validity in seconds. + auth: + expires: 300 + ## A new user can only request "max_count" of verify tokens/codes within next "request_timeslot" minutes. + verify: + # Verify token validity in seconds. + expires: 3600 + # Number of times a token can be requested. + maxCount: 1000 + # Time slot in minutes for observing the max_counter parameter. + timeSlot: 60 + ## Access token configuration. + access: + # Access token validity in seconds. + expires: 604800 + device: + # Limits the number of failed device registration attempts for given timeslot (in minutes). + maxFailed: 200 + # Timeslot (in minutes) + attemptsTimeslot: 60 + phone: + # Limits the number of failed phone (phone number) registration attempts for given timeslot (in minutes). + maxFailed: 200 + # Timeslot (in minutes) + attemptsTimeslot: 60 + + # Google integration. + google: + tokenApiUrl: https://www.googleapis.com/oauth2/v4/token + redirectUrl: https://web.staging.nynja.net/oauth/google + clientId: "AgBSFq/x2PTsU6Ry5Jx8zBDis5ECpEMJKy1HfT6YTcKkQfGwMFPN0X9HbxG6rFZgBliIbBCUwTAC1Ct1V+DmNoWx7kKCZmcqlIKLvIvanHxc/7tzfurq+xSGK8SsK87T1Z1SQ+fIaHyh0wMYlU+LdWuN/L9XgPOA/gMVUeg3KfwWCo1MUnyXTZu7oxyehg9s072kBPL/SJcKPcQu+7skZG5OYr2gelR/0tUgKkGE9Elc+ugNUQKvTl3qHlgCXlxijkbSFBaRLsa1e9Yt8NZggeW+7+IgooiWPyS4Be6InoX0RQvitP7c2+rW1VE+/iLb+qNH2+hnAtmsbM4+TXi2FsD1lRR+uGPRnKhUwQiVr72wK3U3tW3X3uRrY6cK4ubH4qShh3GcKi+2TFwwW4F8MlF358Y6M8bvsyyr3Ba0DNo/eSGZg5R2GrbVmkdEWRLJsgRWzj7SOe/wes2vbea6Cq1A5YKqausnYdJAXAtioanrsOk/lGDOtxI1if3PrAkHidJqxQHemzaXAou5ZggvRx1z0HB0r6UcbH34Q8AWxTwi7e91t7jM3pm4np1kpL8afQnsR3VonANgbzfQv4d7XP4Q6V4uTdL1jC8Lvq1uvtmJixucajNhpCvwHYJo/hzSq3NVw5zK/ONzQAErV8tkalX2IYO7yiyn6w8cCpQHT8AsAKLWDMi+RWNlNPHuHPBX44smfvDEzvfXrl15uk0OEEC0YpNkqddlVvpyTR8IIc3Mt9FghLnA++Zi0W04JfphNCLPDJPHVjNrjidYlgH85ym2f9gFbxm32PI=" + clientSecret: "AgAQtC7A3xN70LpTJE/fP+kX6jDikJfj6OgvaaWsqkXATOesjxxMhpEbrZKZUn8OHIU5gxXdD1KZHty+Z8F6yGcwsXEVYoGmbXjQMsGTsbuIIwKDlzAZQndyWSNTJ3/QxN80bVkNrYTBfUUOdNtWMg3KM4VAHmmvvC2E11wbFvK7KMnM5ftuJOWSwgwl2+YVlZV0kmWi0LPTMVBR8XWNwMcIFbw9X/8RuLlHGuyRFQ1IjKge2AGGbywVJnBVsVuPhwtXVz1tzXAIXeM04orPmul+kdTxrOxYZORD3AJQuhBQckilbXg3h7frFEug7k/8RylJC+6xL4gV59Qnkj1SJihqa9qHURzaR9NVtMlegyB4lxBjZRsAavfxL/0ASlCk21JNF/P0C18sw3rRfo7Ql7tYDgA74WpWaesUrVHh3UZbHxt9zfcS+3yTd3j+z9zuDecm7Vsl/+MRvZn6InMbQWHQg2O69NPsBFF2oxuZD0iEbRluQu970XzWl8bV6cuzR726u4ck+sQDqnOmduEtqLYCXFaQeEm7ZVRSIUeZ1cFfHje0z3TpOQB5NmCW9XFVCkfM56J6vMy6F4sAseYYVyMBf5jaNzVVHtR1aHi5ezv6atwtANjxVQwYgcuqm8IAziUPwyTI8hPPwC7VXxNPxr6GNvLee+/zwvX4LJrUz64ZievxIBdyKV0aNB8CjfoNh+imWiZ2uwqrwccy2dn8y1RJAQyX3AARjp4=" + + # Facebook integration. + facebook: + userInfoByTokenURL: https://graph.facebook.com/v3.1/me?access_token= + oauthTokenProviderURL: https://graph.facebook.com/v3.1/oauth/access_token + redirectUri: https://web.dev-eu.nynja.net/oauth/facebook + appId: "AgAmyMudv7C0n+ddMvlmuVAewwFoIv0CgDdJ++EGvdOfYuEMz6oJnTZlQbIg8HzqfLHnPg4zPpX97609A+EgwITXzZ/9nxnr7y4RMQsWbYRC/LSo8KS8bPqkNW1pNhY0/rEL7VsCPgcVRimLvQjLo5poD2NYf5g09B0zVWm2JnbmEtDfRKEF+6nBrybRRUGD3mHNkB7cR4wWH98VyTZUrY8i8O6htCgN6kbtHKnlPytEap4JWofX99qNhw0OPJwwhPOMNHk8OHb65bRlfyBHhF4pbrGRBGvjMj6PQj89jEWtf4vWracJChSKeg7gxTEBx1RAmdYkcy1ljoEZTSLw8iP5tJg4XZW6cQTVVufKSXVp5CF1hEYhcPYg3pd4+28F8RlNEBP1GBWkIrZxKKRuhLoI0O9WXSmITtCFAxtjAWlQXzBVe+1BCsxI5SVb0RZojk1zPDyvJ3d1zXP7pg/8vO0x6vPZCccnC5+DOaUoz647c89LJGoNwy+4yHRUI9GBUZV1SXXDmghLWziRe0nLHOBb5/KQMkiW0/5Mniq54UTdziAOUnw8CANJI8Q1fXDqIhcreGVx+aBKf6tGRjmfe8EUp7c8+wJToIkl5rLPMIaDSu661WOGBZGibJ9PzsqNHN/f8X0rvjv0mfxhb6yBLFVgAYjH7yQvii7zqRggaFex8exnTHVm8t5YomV2RJJD7n2NbqThHVlred+PbiwpzHSm" + secretKey: "AgBj0S2NV67z0PBy7qutJVqgjK/YIbfUurziUoC0sOZn9Rp3MvYINBFhoG6ye2mhwlIAvT5EZ/qqE+ajPrx6WmMZnONwWmeaT8O3t85L4baKQbCX+6UgbmYEZXHWGzI69noXXmMEv3KkR3utmm3n5TxSWIbpepNN4mT55GH0j6NHJnWXNR3xH9K/iRbkoDf8N1GhiK5klMaaVnMsajjnKxO8vyYsY53VC49KIEF4b8BFrar1xcdNf1pThNt/8e7z+/FqAaTqJXETAjFckExtZSCzRkOdgjJbHUYm1b5iGwlRTxm5gosNVWgkXULTCUxq3+/ZpXfwbDwtp8sk8op22dRFU3fSWL0tdU4U1WqMGGdGbN8jbwHV0g8u0yHAUOXYlPepQu2mIEWzI+bob0VU6opYT3VSSbRuFPrcVvZpWTWjQNHyeRwNNXDaEB4gxkKO0+xAKHB1PT3poVRbRUkAVIB0Hv3S7b1E0Ys3IaomOCUr37MolVlDcDCRrH4nlLCEfwAZF6dFmED7acpCJKknKn66WaN+hqFPO7eaazdioT16HXXas2TyCZQLTPDwoso9l+aJ6Jwn/jn2bc6MROl6oowtQ1M0kyWee6NJKc6t3gzVZ5fGazk52q7uGt3Qn3ol8koZLWWqZFarwuJnuxrnwMc5uBOsMb+Pr/8Cv+P51sjzQJiXYv/8INn68B4KMV34NVsCXFceJn4ox1QnzoQirNMiBGFrAs4D3oi7SxYx9tPejA==" + + # CORS policy + corsPolicy: + allowOrigin: + - https://web.staging.nynja.net + allowMethods: + - POST + - GET + - OPTIONS + allowCredentials: false + allowHeaders: + - content-type + - x-grpc-web + - authorization + maxAge: "600s" -- GitLab From 143f36d5c64fa06b051a033758c3a2420d047519 Mon Sep 17 00:00:00 2001 From: Nynja CI Date: Fri, 4 Jan 2019 13:02:41 +0000 Subject: [PATCH 45/46] Updated account-service tag to master-3 --- account/account-service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/account/account-service.yaml b/account/account-service.yaml index 6fe386d..453ec6a 100644 --- a/account/account-service.yaml +++ b/account/account-service.yaml @@ -9,7 +9,7 @@ spec: replicaCount: 2 image: repository: eu.gcr.io/nynja-ci-201610/account/account-service - tag: master-2 + tag: master-3 gateway: selector: - api-gateway.default.svc.cluster.local -- GitLab From e5d98e121c24eaf2c05677685972f34bef1d801e Mon Sep 17 00:00:00 2001 From: Nynja CI Date: Fri, 4 Jan 2019 13:34:28 +0000 Subject: [PATCH 46/46] Updated account-service tag to master-4 --- account/account-service.yaml | 43 +++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/account/account-service.yaml b/account/account-service.yaml index 453ec6a..8b80d72 100644 --- a/account/account-service.yaml +++ b/account/account-service.yaml @@ -7,11 +7,52 @@ spec: name: account-service values: replicaCount: 2 + image: repository: eu.gcr.io/nynja-ci-201610/account/account-service - tag: master-3 + tag: master-4 + gateway: selector: - api-gateway.default.svc.cluster.local hosts: - account.staging.nynja.net + + resources: + limits: + cpu: 1 + memory: 1500Mi + requests: + cpu: 500m + memory: 1000Mi + + ports: + containerPort: + http: 8080 + grpc: 6565 + + # CORS policy + corsPolicy: + allowOrigin: + - http://localhost:3000 + - https://localhost + - https://localhost/grpc/ + - http://10.191.224.180:3000 + - https://localhost:8080 + - https://127.0.0.1:8080 + - https://web.dev-eu.nynja.net + - https://web.staging.nynja.net + - https://web.nynja.net + - http://10.191.38.1 + - https://admin-console.dev-eu.nynja.net + allowMethods: + - POST + - GET + - OPTIONS + allowCredentials: false + allowHeaders: + - content-type + - x-grpc-web + - authorization + maxAge: "600s" + -- GitLab