Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit 15d1058a authored by Natalia Szakiel's avatar Natalia Szakiel
Browse files

Merge branch 'feature/sprint7_ms' into 'develop' 

Feature/sprint7 ms

See merge request !55
parents 78f149db 326a1433
No related branches found
No related tags found
4 merge requests!61Feature/update codeowners,!58Develop,!56Develop,!55Feature/sprint7 ms
Pipeline #229192 passed
Stage: security-testing
Stage: releasing
Hide whitespace changes
Inline Side-by-side
Showing
with 158 additions and 217 deletions
.gitignore
+ 2
− 1
View file @ 15d1058a
*.lock
*.tgz
\ No newline at end of file
*.tgz
*.pem
\ No newline at end of file
charts/kibana/dashboards/dashboards.ndjson
+ 38
− 28
View file @ 15d1058a
Source diff could not be displayed: it is too large. Options to address this: view the blob.
charts/kibana/scripts/load_objects.sh
+ 2
− 2
View file @ 15d1058a
......@@ -12,7 +12,7 @@ do
while :
do
echo "Attempt no. $i to load ILM"
curl -k -Ss -u elastic:${ELASTIC_PASSWORD} -X PUT https://elastic-elasticsearch-es-http:9200/_ilm/policy/$x -H 'Content-Type: application/json' -H 'kbn-xsrf: true' -d @/usr/share/logstash/ilm/logstash-$x.json > $LOG_FILE
curl -k -Ss -u elastic:${ELASTIC_PASSWORD} -X PUT https://${RELEASE_NAME}-elasticsearch-es-http:9200/_ilm/policy/$x -H 'Content-Type: application/json' -H 'kbn-xsrf: true' -d @/usr/share/logstash/ilm/logstash-$x.json > $LOG_FILE
echo "Response:"
cat $LOG_FILE
echo -e "\n--------"
......@@ -35,7 +35,7 @@ do
while :
do
echo "Attempt no. $i to load template"
curl -k -Ss -u elastic:${ELASTIC_PASSWORD} -X PUT https://elastic-elasticsearch-es-http:9200/_index_template/$x -H 'Content-Type: application/json' -H 'kbn-xsrf: true' -d @/mnt/ilm/charts/kibana/templates/$x-log.json > $LOG_FILE
curl -k -Ss -u elastic:${ELASTIC_PASSWORD} -X PUT https://${RELEASE_NAME}-elasticsearch-es-http:9200/_index_template/$x -H 'Content-Type: application/json' -H 'kbn-xsrf: true' -d @/mnt/ilm/charts/kibana/templates/$x-log.json > $LOG_FILE
echo "Response:"
cat $LOG_FILE
echo -e "\n--------"
......
charts/templates/_helpers.tpl
+ 7
− 7
View file @ 15d1058a
......@@ -2,13 +2,13 @@
Kibana dns
*/}}
{{- define "kibana.dns" -}}
kibana.{{ default .Release.Namespace .Values.namespaceTag }}.{{ .Values.domainSuffix }}
kibana.{{ .Values.namespaceTag }}.{{ .Values.domainSuffix }}
{{- end -}}
{{/*
Kibana full URL with base path
*/}}
{{- define "kibana.dns.fullPath" -}}
https://{{ template "kibana.dns" . }}{{- if eq .Values.openStandardHttpsPorts false -}}:25602{{- end -}}{{- if and (.Values.kibana.ingressSubpath) (ne "/" .Values.kibana.ingressSubpath) }}{{- .Values.kibana.ingressSubpath}}{{- end }}
https://{{ template "kibana.dns" . }}
{{- end -}}
......@@ -17,14 +17,14 @@ https://{{ template "kibana.dns" . }}{{- if eq .Values.openStandardHttpsPorts fa
Elasticsearch api dns
*/}}
{{- define "elasticsearch.dns" -}}
elasticsearch.{{ default .Release.Namespace .Values.namespaceTag }}.{{ .Values.domainSuffix }}
elasticsearch.{{ .Values.namespaceTag }}.{{ .Values.domainSuffix }}
{{- end -}}
{{/*
Logstash input dns
*/}}
{{- define "logstash.dns" -}}
logstash.{{ .Values.logstash.beats.pipelines_group_name }}.{{ default .Release.Namespace .Values.namespaceTag }}.{{ .Values.domainSuffix }}
logstash.{{ .Values.namespaceTag }}.{{ .Values.logstash.beats.pipelines_group_name }}.{{ .Values.domainSuffix }}
{{- end -}}
{{/*
......@@ -44,7 +44,7 @@ Logstash input dns for many ingressRouteTCPs
Filebeat input dns
*/}}
{{- define "filebeat.dns" -}}
filebeat.{{ default .Release.Namespace .Values.namespaceTag }}.{{ .Values.domainSuffix }}
filebeat.{{ .Values.namespaceTag }}.{{ .Values.domainSuffix }}
{{- end -}}
......@@ -52,5 +52,5 @@ filebeat.{{ default .Release.Namespace .Values.namespaceTag }}.{{ .Values.domain
Filebeat for agents input dns
*/}}
{{- define "filebeat4agents.dns" -}}
filebeat4agents.{{ default .Release.Namespace .Values.namespaceTag }}.{{ .Values.domainSuffix }}
{{- end -}}
\ No newline at end of file
filebeat4agents.{{ .Values.namespaceTag }}.{{ .Values.domainSuffix }}
{{- end -}}
charts/templates/elasticsearch.yaml
+ 9
− 11
View file @ 15d1058a
......@@ -17,9 +17,8 @@ spec:
- secretName: logstash-writer-secret
- secretName: user-monitoring-secret
nodeSets:
{{- range .Values.elasticsearch.nodeSets }}
- name: {{ .name }}
count: {{ .count}}
- name: {{ .Values.elasticsearch.name }}
count: {{ .Values.elasticsearch.count }}
config:
xpack.security.authc.token.enabled: true
http.cors.enabled : true
......@@ -35,12 +34,12 @@ spec:
- ReadWriteOnce
resources:
requests:
storage: {{ .diskSpace }}
storageClassName: {{ .storageClassName }}
storage: {{ .Values.elasticsearch.diskSpace }}
storageClassName: {{ .Values.elasticsearch.storageClassName }}
podTemplate:
metadata:
labels:
stack-namespace: {{$.Release.Namespace}}
stack-namespace: {{ .Release.Namespace }}
spec:
initContainers:
- name: sysctl
......@@ -64,7 +63,7 @@ spec:
imagePullPolicy: Always
securityContext:
runAsNonRoot: true
{{- with .resources }}
{{- with .Values.elasticsearch.resources }}
resources:
{{- toYaml . | nindent 12 }}
{{- end }}
......@@ -72,16 +71,15 @@ spec:
- name: ELASTICSEARCH_PASSWORD
valueFrom:
secretKeyRef:
name: {{ $.Release.Name -}}-elasticsearch-es-elastic-user
name: {{ .Release.Name -}}-elasticsearch-es-elastic-user
key: elastic
{{- with $.Values.elasticsearch.env }}
{{- with .Values.elasticsearch.env }}
{{- toYaml . | nindent 10 }}
{{- end }}
volumes:
- name: certs
secret:
secretName: {{ $.Release.Name }}-elasticsearch-http-cert-secret-internal
{{- end }}
secretName: {{ .Release.Name }}-elasticsearch-http-cert-secret-internal
http:
tls:
certificate:
......
charts/templates/filebeat-agents.yaml
+ 9
− 7
View file @ 15d1058a
......@@ -41,7 +41,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: ELASTIC_ELASTICSEARCH_ES_HOSTS
value: 'https://elastic-elasticsearch-es-http.{{ .Release.Namespace }}.svc:9200'
value: 'https://{{ .Release.Name }}-elasticsearch-es-http.{{ .Release.Namespace }}.svc:9200'
- name: LOGSTASH_HOSTS
value: 'logstash-{{ .Values.logstash.beats.pipelines_group_name }}-ls-api.{{ .Release.Namespace }}:5044'
- name: MONITORING_USER
......@@ -53,8 +53,10 @@ spec:
valueFrom:
secretKeyRef:
name: user-monitoring-secret
key: password
#comments
key: password
- name: MONITORED_NAMESPACE
value: '{{ .Release.Namespace }}'
volumes:
- name: varlogcontainers
hostPath:
......@@ -71,7 +73,7 @@ spec:
defaultMode: 0555
- name: es-certs # used for monitoring
secret:
secretName: elastic-elasticsearch-http-cert-secret-internal
secretName: {{ .Release.Name }}-elasticsearch-http-cert-secret-internal
- name: filebeat-certs
secret:
secretName: filebeat4agents-certs-secret
......@@ -106,7 +108,7 @@ spec:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: filebeat4agents-role
name: filebeat4agents-role-{{ .Release.Namespace }}
rules:
- apiGroups: [""] # "" indicates the core API group
resources:
......@@ -141,14 +143,14 @@ metadata:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: filebeat4agents-rolebinding
name: filebeat4agents-rolebinding-{{ .Release.Namespace }}
subjects:
- kind: ServiceAccount
name: filebeat4agents-account
namespace: {{ .Release.Namespace }}
roleRef:
kind: ClusterRole
name: filebeat4agents-role
name: filebeat4agents-role-{{ .Release.Namespace }}
apiGroup: rbac.authorization.k8s.io
---
apiVersion: v1
......
charts/templates/filebeat.yaml
+ 2
− 2
View file @ 15d1058a
......@@ -31,7 +31,7 @@ spec:
name: example-script
env:
- name: ELASTIC_ELASTICSEARCH_ES_HOSTS
value: 'https://elastic-elasticsearch-es-http.{{ .Release.Namespace }}.svc:9200'
value: 'https://{{ .Release.Name }}-elasticsearch-es-http.{{ .Release.Namespace }}.svc:9200'
- name: LOGSTASH_HOSTS
value: 'logstash-{{ .Values.logstash.beats.pipelines_group_name }}-ls-api.{{ .Release.Namespace }}:5044'
- name: MONITORING_USER
......@@ -54,7 +54,7 @@ spec:
secretName: filebeat-certs-secret
- name: es-certs # used for monitoring
secret:
secretName: elastic-elasticsearch-http-cert-secret-internal
secretName: {{ .Release.Name }}-elasticsearch-http-cert-secret-internal
- name: example-script
configMap:
name: filebeat-example-script
......
charts/templates/heartbeat.yaml
+ 4
− 13
View file @ 15d1058a
......@@ -9,18 +9,9 @@ spec:
elasticsearchRef:
name: {{ .Release.Name }}-elasticsearch
config:
heartbeat.monitors:
- type: tcp
schedule: '@every 5s'
hosts: ["elastic-elasticsearch-es-http.observability.svc:9200"]
- type: tcp
schedule: '@every 5s'
hosts: ["kibana.dev.simpl-europe.eu:443"]
- type: icmp
id: ping-myhost
name: My Host Ping
hosts: ["elastic-kibana-kb-http.observability.svc"]
schedule: '*/5 * * * * * *'
{{- with .Values.heartbeat.services }}
{{- toYaml . | nindent 4 }}
{{- end }}
setup.ilm.enabled: true
setup.ilm.policy_name: heartbeat-ilm
setup.ilm.policy_file: "/usr/share/heartbeat/ilm/heartbeat-ilm.json"
......@@ -40,7 +31,7 @@ spec:
- name: heartbeat-ilm-vol
configMap:
name: heartbeat-ilm-configmap
defaultMode: 511
defaultMode: 511
---
apiVersion: v1
kind: ConfigMap
......
charts/templates/kibana.yaml
+ 4
− 9
View file @ 15d1058a
......@@ -15,10 +15,6 @@ spec:
server.ssl.enabled: true
elasticsearch.requestTimeout: 120000
server.publicBaseUrl: "{{ template "kibana.dns.fullPath" . }}"
{{- if and (.Values.kibana.ingressSubpath) (ne "/" .Values.kibana.ingressSubpath) }}
server.basePath: {{ .Values.kibana.ingressSubpath }}
server.rewriteBasePath: true
{{- end }}
xpack.reporting.enabled: true
xpack.reporting.kibanaServer.protocol: "https"
{{- with .Values.kibana.config }}
......@@ -57,7 +53,7 @@ spec:
readinessProbe:
httpGet:
scheme: HTTPS
path: {{- with .Values.kibana.ingressSubpath }} {{ . }} {{- end }}
path: "/"
port: 5601
env:
- name: ELASTIC_PASSWORD
......@@ -75,7 +71,6 @@ spec:
volumes:
- name: repo
emptyDir: {}
http:
tls:
certificate:
......@@ -88,18 +83,18 @@ metadata:
annotations:
nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
acme.cert-manager.io/http01-edit-in-place: "true"
cert-manager.io/cluster-issuer: dev-staging
cert-manager.io/cluster-issuer: {{ .Values.clusterIssuer }}
spec:
ingressClassName: nginx
tls:
- hosts:
- {{ template "kibana.dns" . }}
secretName: {{ .Release.Name }}-kibana-cert-secret
secretName: {{ .Release.Name }}-kibana-ssl
rules:
- host: {{ template "kibana.dns" . }}
http:
paths:
- path: {{ default "/" .Values.kibana.ingressSubpath }}
- path: "/"
pathType: Prefix
backend:
service:
......
charts/templates/logstash_beats.yaml
+ 10
− 6
View file @ 15d1058a
......@@ -7,7 +7,7 @@ metadata:
spec:
image: {{ .Values.logstash.image }}:{{ default .Values.elasticVersion .Values.logstash.imageTag }}
version: {{ .Values.elasticVersion }}
count: {{ .Values.logstash.count }}
count: {{ .Values.logstash.count_beats }}
elasticsearchRefs:
- name: {{ .Release.Name }}-elasticsearch
clusterName: {{ .Release.Name }}-elasticsearch
......@@ -65,7 +65,7 @@ spec:
volumeMounts:
- name: repo
mountPath: /mnt/ilm/
- name: load-ilm
- name: load-objects
command: ["/bin/sh", "-c", "cd /mnt/ilm/charts/kibana/scripts; chmod +x ./load_objects.sh; ./load_objects.sh 2>&1 "]
volumeMounts:
- name: repo
......@@ -77,6 +77,8 @@ spec:
mountPath: /usr/share/logstash/ilm/logstash-technical-ilm.json
subPath: logstash-technical-ilm.json
env:
- name: RELEASE_NAME
value: {{ .Release.Name }}
- name: ELASTIC_PASSWORD
valueFrom:
secretKeyRef:
......@@ -106,7 +108,9 @@ spec:
- name: logstash-technical-ilm-vol
mountPath: /usr/share/logstash/ilm/logstash-technical-ilm.json
subPath: logstash-technical-ilm.json
env:
env:
- name: LS_JAVA_OPTS
value: {{ .Values.logstash.env.ls_java_opts }}
- name: LOGSTASH_USER
valueFrom:
secretKeyRef:
......@@ -128,7 +132,7 @@ spec:
name: user-monitoring-secret
key: password
- name: ELASTIC_ELASTICSEARCH_ES_HOSTS
value: 'https://elastic-elasticsearch-es-http.{{ .Release.Namespace }}.svc:9200'
value: 'https://{{ .Release.Name }}-elasticsearch-es-http.{{ .Release.Namespace }}.svc:9200'
- name: ELASTICSEARCH_SSL_CERTIFICATE_VERIFICATION
value: "true"
- name: ELASTICSEARCH_SSL_CA_PATH
......@@ -151,11 +155,11 @@ spec:
- name: logstash-business-ilm-vol
configMap:
name: logstash-business-ilm-configmap
defaultMode: 511
defaultMode: 511
- name: logstash-technical-ilm-vol
configMap:
name: logstash-technical-ilm-configmap
defaultMode: 511
defaultMode: 511
pipelinesRef:
secretName: logstash-{{ .Values.logstash.beats.pipelines_group_name }}-pipelines-yml
---
......
charts/templates/logstash_syslog.yaml
+ 2
− 2
View file @ 15d1058a
......@@ -7,7 +7,7 @@ metadata:
spec:
image: {{ .Values.logstash.image }}:{{ default .Values.elasticVersion .Values.logstash.imageTag }}
version: {{ .Values.elasticVersion }}
count: {{ .Values.logstash.count }}
count: {{ .Values.logstash.count_syslog }}
elasticsearchRefs:
- name: {{ .Release.Name }}-elasticsearch
clusterName: {{ .Release.Name }}-elasticsearch
......@@ -71,7 +71,7 @@ spec:
name: logstash-writer-secret
key: password
- name: ELASTIC_ELASTICSEARCH_ES_HOSTS
value: 'https://elastic-elasticsearch-es-http.{{ .Release.Namespace }}.svc:9200'
value: 'https://{{ .Release.Name }}-elasticsearch-es-http.{{ .Release.Namespace }}.svc:9200'
volumes:
{{- range .Values.logstash.syslog.pipelines }}
- name: pipeline-config-{{- .name }}
......
charts/templates/metricbeat.yaml
+ 11
− 7
View file @ 15d1058a
......@@ -74,10 +74,14 @@ spec:
processors:
- add_cloud_metadata: {}
- add_host_metadata: {}
{{- with .Values.metricbeat.dropEvent }}
- drop_event:
{{- toYaml . | nindent 8 }}
{{- end }}
when:
not:
or:
- equals:
kubernetes.namespace: {{ .Release.Namespace }}
- equals:
service.type: system
daemonSet:
podTemplate:
spec:
......@@ -127,12 +131,12 @@ spec:
- name: metricbeat-ilm-vol
configMap:
name: metricbeat-ilm-configmap
defaultMode: 511
defaultMode: 511
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: metricbeat
name: metricbeat-{{ .Release.Namespace }}
rules:
- apiGroups:
- ""
......@@ -183,14 +187,14 @@ metadata:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: metricbeat
name: metricbeat-{{ .Release.Namespace }}
subjects:
- kind: ServiceAccount
name: metricbeat
namespace: {{.Release.Namespace}}
roleRef:
kind: ClusterRole
name: metricbeat
name: metricbeat-{{ .Release.Namespace }}
apiGroup: rbac.authorization.k8s.io
---
apiVersion: v1
......
charts/values/dev/observability/values.yaml
+ 38
− 121
View file @ 15d1058a
# version of all elastic applications
elasticVersion: 8.15.1
# Name of aws environment
envTag: "dev"
namespaceTag: "test-namespace"
# This suffix will be used to create subdomain of following template:
# kibana.NAMESPACE_TAG.DOMAIN_SUFFIX
domainSuffix: "simpl-europe.eu"
# This value is used to create unique dns for each deployment. By default it equals to namespace.
namespaceTag: "dev"
# Spread pods evenly between subnets
createTopologySpreadConstraints: true
# Force pods to be scheduled evenly between separete AZ, this means if all nodes in AZ will be full pod won't be scheduled.
# Turning this off will still create pods in seperate AZ, but k8s scheduler won't be able to respect topologySpreadConstrains, will schedule pods in the same AZ.
forceDeployInSeperateAZ: true
# Open port 443 for each component on the Traefik level.
openStandardHttpsPorts: true
# imagePullSecrets defines the secrets with credentials to docker registry, for example nexus.
imagePullSecrets: []
# kibana.NAMESPACE.NAMESPACE_TAG.DOMAIN_SUFFIX
domainSuffix: "dev.simpl-europe.eu"
#ClusterIssuer to generate Kibana SSL front certificate
clusterIssuer: "dev-prod-dns01"
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch
# Elasticsearch's image tag, by default it equals to elasticVersion
ccr_remote_ca_file: ccr-remote-ca.pem
imageTag: ""
jvm_options_xms: 1g
jvm_options_xmx: 1g
cert:
duration: 2160h0m0s # 90d
renewBefore: 360h0m0s # 15d
#Environment variables to set in kibana pod
#Usage from cli:
# --set "elasticsearch.env[0].name=VARIABLE_NAME" --set "elasticsearch.env[0].value=VARIABLE_VALUE"
env: []
# here you can specify several node groups (e.g. master, data groups)
nodeSets:
- name: "node"
# number of elasticsearch nodes in each group
count: 3
# persistent volume claim size
diskSpace: 60Gi
# name of StorageClass that will be used to create VolumeClaims. (StorageClass must exist)
storageClassName: csi-cinder-high-speed
# here you can specify elasticsearch config e.g
# config:
# node.roles: ["master"]
config: {}
resources:
requests:
memory: 4Gi
limits:
memory: 4Gi
cpu: "1"
name: node
count: 3
diskSpace: 60Gi
storageClassName: csi-cinder-high-speed
resources:
requests:
memory: 4Gi
limits:
memory: 4Gi
cpu: "1"
kibana:
# set >0 to deploy kibana, 0 otherwise
count: 1
image: docker.elastic.co/kibana/kibana
#Branch name to donwload dashboards
dashboardsBranch: "feature/dashboards"
dashboardsBranch: "develop"
# Kibana's image tag, by default it equals to elasticVersion
imageTag: ""
# name of helm release where elasticsearch is installed. If you install kibana together with elasticsearch, leave it empty.
elasticsearchReleaseName: ""
# Kibana server will listen on that subpath
cert:
duration: 2160h0m0s # 90d
renewBefore: 360h0m0s # 15d
......@@ -92,13 +52,11 @@ kibana:
memory: 1Gi
limits:
memory: 1Gi
#Environment variables to set in kibana pod
#Usage from cli:
# --set "kibana.env[0].name=VARIABLE_NAME" --set "kibana.env[0].value=VARIABLE_VALUE"
env: []
logstash:
ilm:
business:
......@@ -113,15 +71,15 @@ logstash:
max_primary_shard_size: 1gb
delete:
min_age: 30d
count: 1
count_beats: 1
count_syslog: 0
image: docker.elastic.co/logstash/logstash
config: {}
diskSpace: 3Gi
# name of StorageClass that will be used to create VolumeClaims. (StorageClass must exist)
storageClassName: csi-cinder-high-speed
imageTag: ""
env:
LS_JAVA_OPTS: "-Xmx256m -Xms256m"
ls_java_opts: "-Xms3g -Xmx3g"
resources:
requests:
memory: 4Gi
......@@ -135,10 +93,6 @@ logstash:
path.config: "/app/elastic/logstash/config/pipelines/*.config"
pipeline.workers: 1
pipeline.batch.size: 125
workers: 1
batch:
size: 125
beats:
pipelines_group_name: "beats"
pipelines:
......@@ -259,7 +213,6 @@ logstash:
date {
match => [ "timestamp", "yyyy-MM-dd HH:mm:ss.SSS", "ISO8601", "yyyy-MM-dd HH:mm:ss", "dd MMM yyyy HH:mm:ss.SSS" ]
}
}
output: |-
output {
......@@ -292,19 +245,6 @@ logstash:
action => "create"
}
}
# else if [fields][logtype] == "agents" {
# elasticsearch {
# hosts => [ "${ELASTIC_ELASTICSEARCH_ES_HOSTS}" ]
# user => "${LOGSTASH_USER}"
# password => "${LOGSTASH_PASSWORD}"
# ssl_enabled => "true"
# ssl_verification_mode => "full"
# ssl_certificate_authorities => "/usr/share/logstash/config/certs/ca.crt"
# data_stream => "true"
# data_stream_type => "logs"
# data_stream_dataset => "agents"
# }
# }
else {
elasticsearch {
hosts => [ "${ELASTIC_ELASTICSEARCH_ES_HOSTS}" ]
......@@ -357,13 +297,11 @@ logstash:
filebeat:
image: docker.elastic.co/beats/filebeat
config: {}
count: 1
# name of StorageClass that will be used to create VolumeClaims. (StorageClass must exist)
imageTag: ""
# Total number of the sample messages to generate. Provide negative number to generate infinitely
totalMessages: 604800
# Number of messages per minute. Provide negative number to generate messages without time limit.
messagesPerMinute: 30
cert:
......@@ -423,11 +361,6 @@ filebeat:
filebeat.config.modules:
path: ${path.config}/modules.d/*.yml
reload.enabled: false
# processors:
# - add_kubernetes_metadata:
# in_cluster: true
# logging.level: debug
name: "test"
output: |
output.logstash:
hosts: ["${LOGSTASH_HOSTS}"]
......@@ -444,19 +377,9 @@ filebeat:
password: "${MONITORING_PASSWORD}"
filebeat4agents:
image: docker.elastic.co/beats/filebeat
config: {}
destinationLogstashHost: logstash-beats-ls-api.observability:5044
# name of StorageClass that will be used to create VolumeClaims. (StorageClass must exist)
imageTag: ""
# Total number of the sample messages to generate. Provide negative number to generate infinitely
totalMessages: 604800
# Number of messages per minute. Provide negative number to generate messages without time limit.
messagesPerMinute: 30
cert:
duration: 2160h0m0s # 90d
renewBefore: 360h0m0s # 15d
......@@ -469,11 +392,7 @@ filebeat4agents:
- condition:
or:
- equals:
kubernetes.namespace: "authority01"
- equals:
kubernetes.namespace: "dataprovider01"
- equals:
kubernetes.namespace: "consumer01"
kubernetes.namespace: "${MONITORED_NAMESPACE}"
config:
- type: container
paths:
......@@ -497,9 +416,6 @@ filebeat4agents:
processors:
- add_cloud_metadata: {}
- add_host_metadata: {}
# - add_fields:
# fields:
# logtype: "agents"
output: |
output.logstash:
hosts: ["${LOGSTASH_HOSTS}"]
......@@ -519,26 +435,12 @@ metricbeat:
resources:
requests:
memory: 500Mi
cpu: 300m
limits:
memory: 500Mi
cpu: 300m
#Hostname to receive status_pod metrics
kubeStateHost: kube-state-metrics.kube-state-metrics.svc.cluster.local:8080
#Filter for get metric data from specific services,namespaces
dropEvent:
when:
not:
or:
- equals:
kubernetes.namespace: authority01
- equals:
kubernetes.namespace: dataprovider01
- equals:
kubernetes.namespace: consumer01
- equals:
service.type: system
heartbeat:
ilm:
......@@ -547,5 +449,20 @@ heartbeat:
max_primary_shard_size: 100mb
delete:
min_age: 30d
\ No newline at end of file
services:
heartbeat.monitors:
- type: tcp
name: Elasticsearch Service
id: elasticsearch:9200
schedule: '@every 5s'
hosts: ["elastic-elasticsearch-es-http.observability.svc:9200"]
- type: tcp
name: Kibana GUI
id: kibana:443
schedule: '@every 5s'
hosts: ["kibana.dev.simpl-europe.eu:443"]
- type: icmp
id: kibana/icmp
name: Kibana ICMP
hosts: ["elastic-kibana-kb-http.observability.svc"]
schedule: '*/5 * * * * * *'
\ No newline at end of file
charts/values_other.yml 0 → 100644
+ 19
− 0
View file @ 15d1058a
elasticsearch:
count: 2
resources:
requests:
memory: 4Gi
limits:
memory: 4Gi
cpu: "1"
kibana:
count: 1
filebeat:
count: 0
logstash:
count_beats: 1
count_syslog: 0
pipeline.variables.sh
+ 1
− 1
View file @ 15d1058a
PROJECT_VERSION_NUMBER="0.1.1"
\ No newline at end of file
PROJECT_VERSION_NUMBER="0.1.2"
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

For further information about the platform and support, please see https://code.europa.eu/info/about