udpate mutilineparser

on-premise/logging/fluentbit_v3.1.7/2_config/multiline.yaml

@@ -0,0 +1,66 @@
+# Source: fluent-bit/templates/configmap.yaml
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: fluent-bit
+  namespace: logging
+  labels:
+    helm.sh/chart: fluent-bit-0.47.10
+    app.kubernetes.io/name: fluent-bit
+    app.kubernetes.io/instance: fluent-bit
+    app.kubernetes.io/version: "3.1.7"
+    app.kubernetes.io/managed-by: Helm
+data:
+  fluent-bit.conf: |
+    [SERVICE]
+        Daemon Off
+        Flush 1
+        Log_Level warn
+        Parsers_File              /fluent-bit/etc/parsers.conf
+        HTTP_Server On
+        HTTP_Listen 0.0.0.0
+        HTTP_Port 2020
+        Health_Check On
+        storage.path  /var/fluent-bit/state/flb-storage/
+        storage.sync  normal
+        storage.checksum  off
+        storage.backlog.mem_limit 5M
+
+    [INPUT]
+        Name tail
+        Path /var/log/containers/sample-*-dp-*-con-*.log
+        Parser cri
+        Tag normal.<service_name>.<namespace_name>
+        Tag_Regex /sample-(?<service_name>.+)-dp-(.+)_(?<namespace_name>.+)_(.+)-con-(.+).log$
+        Mem_Buf_Limit 5MB
+        Skip_Long_Lines On
+
+    [INPUT]
+        Name tail
+        Path /var/log/containers/sample-*-mdp-*-con-*.log
+        Parser cri
+        Tag multi.<service_name>.<namespace_name>
+        Tag_Regex /sample-(?<service_name>.+)-mdp-(.+)_(?<namespace_name>.+)_(.+)-con-(.+).log$
+        Mem_Buf_Limit 5MB
+        Skip_Long_Lines On
+
+    [FILTER]
+        name                  multiline
+        match                 multi.*
+        multiline.key_content message
+        multiline.parser      java
+
+    [OUTPUT]
+        Name es
+        Match *
+        Host soo-os.maintndjs.shop
+        Port 9200
+        Index test5
+        Type _doc
+        Include_Tag_Key true
+        Tag_key @svc_name
+        Suppress_Type_Name On
+        HTTP_User admin
+        HTTP_Passwd admin
+        tls On
+        tls.verify Off

on-premise/logging/openSearch/openSearch-dashboard_2.11.1.yaml

@@ -137,12 +137,5 @@ spec:
           requests:
             cpu: 100m
             memory: 512M
-        volumeMounts:
-        - name: tls-secret
-          mountPath: /etc/opensearch/certs
-          readOnly: true
-      volumes:
-      - name: tls-secret
-        secret:
-          secretName: logging-ssl
+        #volumeMounts:
         

on-premise/main/calico_v3.28.2/custom-resources.yaml

@@ -9,9 +9,9 @@ spec:
   calicoNetwork:
     ipPools:
     - name: default-ipv4-ippool
-      blockSize: 26
+      blockSize: 24
       cidr: 10.10.0.0/16
-      encapsulation: VXLANCrossSubnet
+      encapsulation: VXLANCrossSubnet         # openstack 에서는 VXLAN을 사용해야해안다 byljh
       natOutgoing: Enabled
       nodeSelector: all()
   registry: reg.inje-private.com

on-premise/main/metrics-server/metric-server_v0.6.4.yaml

@@ -0,0 +1,197 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  labels:
+    k8s-app: metrics-server
+  name: metrics-server
+  namespace: kube-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    k8s-app: metrics-server
+    rbac.authorization.k8s.io/aggregate-to-admin: "true"
+    rbac.authorization.k8s.io/aggregate-to-edit: "true"
+    rbac.authorization.k8s.io/aggregate-to-view: "true"
+  name: system:aggregated-metrics-reader
+rules:
+- apiGroups:
+  - metrics.k8s.io
+  resources:
+  - pods
+  - nodes
+  verbs:
+  - get
+  - list
+  - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  labels:
+    k8s-app: metrics-server
+  name: system:metrics-server
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - nodes/metrics
+  verbs:
+  - get
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  - nodes
+  verbs:
+  - get
+  - list
+  - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    k8s-app: metrics-server
+  name: metrics-server-auth-reader
+  namespace: kube-system
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: extension-apiserver-authentication-reader
+subjects:
+- kind: ServiceAccount
+  name: metrics-server
+  namespace: kube-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    k8s-app: metrics-server
+  name: metrics-server:system:auth-delegator
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: system:auth-delegator
+subjects:
+- kind: ServiceAccount
+  name: metrics-server
+  namespace: kube-system
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  labels:
+    k8s-app: metrics-server
+  name: system:metrics-server
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: system:metrics-server
+subjects:
+- kind: ServiceAccount
+  name: metrics-server
+  namespace: kube-system
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    k8s-app: metrics-server
+  name: metrics-server
+  namespace: kube-system
+spec:
+  ports:
+  - name: https
+    port: 443
+    protocol: TCP
+    targetPort: https
+  selector:
+    k8s-app: metrics-server
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    k8s-app: metrics-server
+  name: metrics-server
+  namespace: kube-system
+spec:
+  selector:
+    matchLabels:
+      k8s-app: metrics-server
+  strategy:
+    rollingUpdate:
+      maxUnavailable: 0
+  template:
+    metadata:
+      labels:
+        k8s-app: metrics-server
+    spec:
+      containers:
+      - args:
+        - --cert-dir=/tmp
+        - --secure-port=4443
+        - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
+        - --kubelet-use-node-status-port
+        - --metric-resolution=15s
+        - --kubelet-insecure-tls
+        image: reg.inje-private.com/nnd002/metrics-server/metrics-server:v0.6.4
+        imagePullPolicy: IfNotPresent
+        livenessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /livez
+            port: https
+            scheme: HTTPS
+          periodSeconds: 10
+        name: metrics-server
+        ports:
+        - containerPort: 4443
+          name: https
+          protocol: TCP
+        readinessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /readyz
+            port: https
+            scheme: HTTPS
+          initialDelaySeconds: 20
+          periodSeconds: 10
+        resources:
+          requests:
+            cpu: 100m
+            memory: 200Mi
+        securityContext:
+          allowPrivilegeEscalation: false
+          readOnlyRootFilesystem: true
+          runAsNonRoot: true
+          runAsUser: 1000
+        volumeMounts:
+        - mountPath: /tmp
+          name: tmp-dir
+      nodeSelector:
+        kubernetes.io/os: linux
+      priorityClassName: system-cluster-critical
+      serviceAccountName: metrics-server
+      volumes:
+      - emptyDir: {}
+        name: tmp-dir
+---
+apiVersion: apiregistration.k8s.io/v1
+kind: APIService
+metadata:
+  labels:
+    k8s-app: metrics-server
+  name: v1beta1.metrics.k8s.io
+spec:
+  group: metrics.k8s.io
+  groupPriorityMinimum: 100
+  insecureSkipTLSVerify: true
+  service:
+    name: metrics-server
+    namespace: kube-system
+  version: v1beta1
+  versionPriority: 100

on-premise/main/rancher_v2.9.1/rancher-cleanup

@@ -0,0 +1 @@
+Subproject commit 1fe0b33ebd4339aeaef721c75388809bb461a4d3

on-premise/main/rancher_v2.9.1/rancher/values.yaml

@@ -135,7 +135,8 @@ tls: external # by ljh
 
 systemDefaultRegistry: "reg.inje-private.com/nnd002"
 # Set to use the packaged system charts
-useBundledSystemChart: false
+#useBundledSystemChart: false
+useBundledSystemChart: true
 
 # Certmanager version compatibility
 certmanager:

on-premise/servicemesh/istio-1.23.1/samples/addons/kiali.yaml

@@ -108,6 +108,10 @@ data:
         root_namespace: istio-system
       tracing:
         enabled: false
+      prometheus:
+        url: "http://prometheus-server.monitoring" # 맞게 설정
+      grafana:
+        url: "https://grafana-dev.kitech.re.kr"   # 맞게 설정
     identity:
       cert_file: ""
       private_key_file: ""