Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(vlogs): update to 0.6.0 and set resource limits #309

Merged
merged 1 commit into from
Aug 22, 2024
Merged

fix(vlogs): update to 0.6.0 and set resource limits #309

merged 1 commit into from
Aug 22, 2024

Conversation

jfroy
Copy link
Owner

@jfroy jfroy commented Aug 22, 2024

No description provided.

@github-actions GitHub Actions
Copy link

github-actions bot commented Aug 22, 2024 •
edited
Loading 

--- kubernetes/apps/observability/grafana/app Kustomization: flux-system/grafana HelmRelease: observability/grafana

+++ kubernetes/apps/observability/grafana/app Kustomization: flux-system/grafana HelmRelease: observability/grafana

@@ -239,13 +239,13 @@

           name: VictoriaMetrics
           type: victoriametrics-datasource
           url: http://vmsingle-stack.observability.svc:8429
         - access: proxy
           name: VictoriaLogs
           type: victorialogs-datasource
-          url: http://victoria-logs-victoria-logs-single-server.observability:9428
+          url: http://victoria-logs.observability:9428
         - access: proxy
           jsonData:
             implementation: prometheus
           name: Alertmanager
           type: alertmanager
           uid: alertmanager
--- kubernetes/apps/observability/vector-aggregator/app Kustomization: flux-system/vector-aggregator ConfigMap: observability/vector-aggregator-configmap

+++ kubernetes/apps/observability/vector-aggregator/app Kustomization: flux-system/vector-aggregator ConfigMap: observability/vector-aggregator-configmap

@@ -31,13 +31,13 @@

         type: prometheus_exporter
         inputs: [internal_metrics]
         address: 0.0.0.0:9090
       victorialogs:
         type: elasticsearch
         inputs: [kubernetes_remap]
-        endpoints: [http://victoria-logs-victoria-logs-single-server.observability:9428/insert/elasticsearch/]
+        endpoints: [http://victoria-logs.observability:9428/insert/elasticsearch/]
         mode: bulk
         api_version: v8
         healthcheck:
           enabled: false
         query:
           _msg_field: message
--- kubernetes/apps/observability/victorialogs/app Kustomization: flux-system/victoria-logs HelmRelease: observability/victoria-logs

+++ kubernetes/apps/observability/victorialogs/app Kustomization: flux-system/victoria-logs HelmRelease: observability/victoria-logs

@@ -13,13 +13,13 @@

     spec:
       chart: victoria-logs-single
       sourceRef:
         kind: HelmRepository
         name: victoriametrics
         namespace: flux-system
-      version: 0.5.4
+      version: 0.6.0
   driftDetection:
     mode: enabled
   install:
     crds: CreateReplace
     remediation:
       retries: 3
@@ -28,12 +28,16 @@

     cleanupOnFail: true
     crds: CreateReplace
     remediation:
       retries: 3
       strategy: rollback
   values:
+    global:
+      victoriaLogs:
+        server:
+          fullnameOverride: victoria-logs
     server:
       ingress:
         annotations:
           nginx.ingress.kubernetes.io/auth-response-headers: x-auth-request-email
           nginx.ingress.kubernetes.io/auth-signin: https://oauth2-proxy...PLACEHOLDER../oauth2/start?rd=$scheme://$best_http_host$request_uri
           nginx.ingress.kubernetes.io/auth-url: https://oauth2-proxy...PLACEHOLDER../oauth2/auth
@@ -44,9 +48,13 @@

           port: http
         ingressClassName: internal
       persistentVolume:
         enabled: true
         size: 10Gi
         storageClass: openebs-hostpath
+      resources:
+        limits:
+          cpu: 200m
+          memory: 300Mi
       serviceMonitor:
         enabled: true

@github-actions GitHub Actions
Copy link

github-actions bot commented Aug 22, 2024 •
edited
Loading 

--- HelmRelease: observability/victoria-logs Service: observability/victoria-logs-victoria-logs-single-server

+++ HelmRelease: observability/victoria-logs Service: observability/victoria-logs-victoria-logs-single-server

@@ -1,23 +0,0 @@

----
-apiVersion: v1
-kind: Service
-metadata:
-  namespace: observability
-  labels:
-    app: server
-    app.kubernetes.io/name: victoria-logs-single
-    app.kubernetes.io/instance: victoria-logs
-    app.kubernetes.io/managed-by: Helm
-  name: victoria-logs-victoria-logs-single-server
-spec:
-  clusterIP: None
-  ports:
-  - name: http
-    port: 9428
-    protocol: TCP
-    targetPort: http
-  selector:
-    app: server
-    app.kubernetes.io/name: victoria-logs-single
-    app.kubernetes.io/instance: victoria-logs
-
--- HelmRelease: observability/victoria-logs StatefulSet: observability/victoria-logs-victoria-logs-single-server

+++ HelmRelease: observability/victoria-logs StatefulSet: observability/victoria-logs-victoria-logs-single-server

@@ -1,88 +0,0 @@

----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  namespace: observability
-  labels:
-    app: server
-    app.kubernetes.io/name: victoria-logs-single
-    app.kubernetes.io/instance: victoria-logs
-    app.kubernetes.io/managed-by: Helm
-  name: victoria-logs-victoria-logs-single-server
-spec:
-  serviceName: victoria-logs-victoria-logs-single-server
-  selector:
-    matchLabels:
-      app: server
-      app.kubernetes.io/name: victoria-logs-single
-      app.kubernetes.io/instance: victoria-logs
-  replicas: 1
-  podManagementPolicy: OrderedReady
-  template:
-    metadata:
-      labels:
-        app: server
-        app.kubernetes.io/name: victoria-logs-single
-        app.kubernetes.io/instance: victoria-logs
-        app.kubernetes.io/managed-by: Helm
-    spec:
-      containers:
-      - name: victoria-logs-single-server
-        securityContext:
-          allowPrivilegeEscalation: false
-          capabilities:
-            drop:
-            - ALL
-          readOnlyRootFilesystem: true
-        image: victoriametrics/victoria-logs:v0.28.0-victorialogs
-        imagePullPolicy: IfNotPresent
-        args:
-        - --retentionPeriod=1
-        - --storageDataPath=/storage
-        - --envflag.enable=true
-        - --envflag.prefix=VM_
-        - --loggerFormat=json
-        ports:
-        - name: http
-          containerPort: 9428
-        livenessProbe:
-          failureThreshold: 10
-          httpGet:
-            path: /health
-            port: 9428
-            scheme: HTTP
-          initialDelaySeconds: 30
-          periodSeconds: 30
-          timeoutSeconds: 5
-        readinessProbe:
-          failureThreshold: 3
-          httpGet:
-            path: /health
-            port: http
-          initialDelaySeconds: 5
-          periodSeconds: 15
-          timeoutSeconds: 5
-        resources: {}
-        volumeMounts:
-        - name: server-volume
-          mountPath: /storage
-          subPath: null
-      securityContext:
-        fsGroup: 2000
-        runAsNonRoot: true
-        runAsUser: 1000
-      terminationGracePeriodSeconds: 60
-      volumes: null
-  volumeClaimTemplates:
-  - apiVersion: v1
-    kind: PersistentVolumeClaim
-    metadata:
-      name: server-volume
-    spec:
-      accessModes:
-      - ReadWriteOnce
-      resources:
-        requests:
-          storage: 10Gi
-      storageClassName: openebs-hostpath
-
--- HelmRelease: observability/victoria-logs Ingress: observability/victoria-logs-victoria-logs-single-server

+++ HelmRelease: observability/victoria-logs Ingress: observability/victoria-logs-victoria-logs-single-server

@@ -1,29 +0,0 @@

----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  annotations:
-    nginx.ingress.kubernetes.io/auth-response-headers: x-auth-request-email
-    nginx.ingress.kubernetes.io/auth-signin: https://oauth2-proxy...PLACEHOLDER../oauth2/start?rd=$scheme://$best_http_host$request_uri
-    nginx.ingress.kubernetes.io/auth-url: https://oauth2-proxy...PLACEHOLDER../oauth2/auth
-  labels:
-    app: server
-    app.kubernetes.io/name: victoria-logs-single
-    app.kubernetes.io/instance: victoria-logs
-    app.kubernetes.io/managed-by: Helm
-  name: victoria-logs-victoria-logs-single-server
-  namespace: observability
-spec:
-  ingressClassName: internal
-  rules:
-  - host: val...PLACEHOLDER..
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: victoria-logs-victoria-logs-single-server
-            port:
-              number: 9428
-
--- HelmRelease: observability/victoria-logs ServiceMonitor: observability/victoria-logs-victoria-logs-single-server

+++ HelmRelease: observability/victoria-logs ServiceMonitor: observability/victoria-logs-victoria-logs-single-server

@@ -1,22 +0,0 @@

----
-apiVersion: monitoring.coreos.com/v1
-kind: ServiceMonitor
-metadata:
-  labels:
-    app: server
-    app.kubernetes.io/name: victoria-logs-single
-    app.kubernetes.io/instance: victoria-logs
-    app.kubernetes.io/managed-by: Helm
-  name: victoria-logs-victoria-logs-single-server
-spec:
-  namespaceSelector:
-    matchNames:
-    - observability
-  selector:
-    matchLabels:
-      app: server
-      app.kubernetes.io/name: victoria-logs-single
-      app.kubernetes.io/instance: victoria-logs
-  endpoints:
-  - port: http
-
--- HelmRelease: observability/victoria-logs Service: observability/victoria-logs

+++ HelmRelease: observability/victoria-logs Service: observability/victoria-logs

@@ -0,0 +1,24 @@

+---
+apiVersion: v1
+kind: Service
+metadata:
+  namespace: observability
+  labels:
+    app: server
+    app.kubernetes.io/name: victoria-logs-single
+    app.kubernetes.io/instance: victoria-logs
+    app.kubernetes.io/managed-by: Helm
+  name: victoria-logs
+spec:
+  clusterIP: None
+  type: ClusterIP
+  ports:
+  - name: http
+    port: 9428
+    protocol: TCP
+    targetPort: http
+  selector:
+    app: server
+    app.kubernetes.io/name: victoria-logs-single
+    app.kubernetes.io/instance: victoria-logs
+
--- HelmRelease: observability/victoria-logs StatefulSet: observability/victoria-logs

+++ HelmRelease: observability/victoria-logs StatefulSet: observability/victoria-logs

@@ -0,0 +1,90 @@

+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: victoria-logs
+  namespace: observability
+  labels:
+    app: server
+    app.kubernetes.io/name: victoria-logs-single
+    app.kubernetes.io/instance: victoria-logs
+    app.kubernetes.io/managed-by: Helm
+spec:
+  serviceName: victoria-logs
+  selector:
+    matchLabels:
+      app: server
+      app.kubernetes.io/name: victoria-logs-single
+      app.kubernetes.io/instance: victoria-logs
+  replicas: 1
+  podManagementPolicy: OrderedReady
+  template:
+    metadata:
+      labels:
+        app: server
+        app.kubernetes.io/name: victoria-logs-single
+        app.kubernetes.io/instance: victoria-logs
+        app.kubernetes.io/managed-by: Helm
+    spec:
+      containers:
+      - name: vlogs
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - ALL
+          readOnlyRootFilesystem: true
+        image: victoriametrics/victoria-logs:v0.28.0-victorialogs
+        imagePullPolicy: IfNotPresent
+        args:
+        - --retentionPeriod=1
+        - --storageDataPath=/storage
+        - --envflag.enable=true
+        - --envflag.prefix=VM_
+        - --loggerFormat=json
+        ports:
+        - name: http
+          containerPort: 9428
+        readinessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /health
+            port: http
+            scheme: HTTP
+          initialDelaySeconds: 5
+          periodSeconds: 15
+          timeoutSeconds: 5
+        livenessProbe:
+          failureThreshold: 10
+          initialDelaySeconds: 30
+          periodSeconds: 30
+          tcpSocket:
+            port: http
+          timeoutSeconds: 5
+        resources:
+          limits:
+            cpu: 200m
+            memory: 300Mi
+        volumeMounts:
+        - name: server-volume
+          mountPath: /storage
+          subPath: null
+      securityContext:
+        fsGroup: 2000
+        runAsNonRoot: true
+        runAsUser: 1000
+      terminationGracePeriodSeconds: 60
+      volumes: null
+  volumeClaimTemplates:
+  - apiVersion: v1
+    kind: PersistentVolumeClaim
+    metadata:
+      name: server-volume
+    spec:
+      accessModes:
+      - ReadWriteOnce
+      resources:
+        requests:
+          storage: 10Gi
+      storageClassName: openebs-hostpath
+
--- HelmRelease: observability/victoria-logs Ingress: observability/victoria-logs

+++ HelmRelease: observability/victoria-logs Ingress: observability/victoria-logs

@@ -0,0 +1,29 @@

+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    nginx.ingress.kubernetes.io/auth-response-headers: x-auth-request-email
+    nginx.ingress.kubernetes.io/auth-signin: https://oauth2-proxy...PLACEHOLDER../oauth2/start?rd=$scheme://$best_http_host$request_uri
+    nginx.ingress.kubernetes.io/auth-url: https://oauth2-proxy...PLACEHOLDER../oauth2/auth
+  labels:
+    app: server
+    app.kubernetes.io/name: victoria-logs-single
+    app.kubernetes.io/instance: victoria-logs
+    app.kubernetes.io/managed-by: Helm
+  name: victoria-logs
+  namespace: observability
+spec:
+  ingressClassName: internal
+  rules:
+  - host: val...PLACEHOLDER..
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: victoria-logs
+            port:
+              name: http
+
--- HelmRelease: observability/victoria-logs ServiceMonitor: observability/victoria-logs

+++ HelmRelease: observability/victoria-logs ServiceMonitor: observability/victoria-logs

@@ -0,0 +1,22 @@

+---
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  labels:
+    app: server
+    app.kubernetes.io/name: victoria-logs-single
+    app.kubernetes.io/instance: victoria-logs
+    app.kubernetes.io/managed-by: Helm
+  name: victoria-logs
+spec:
+  namespaceSelector:
+    matchNames:
+    - observability
+  selector:
+    matchLabels:
+      app: server
+      app.kubernetes.io/name: victoria-logs-single
+      app.kubernetes.io/instance: victoria-logs
+  endpoints:
+  - port: http
+
--- HelmRelease: observability/grafana ConfigMap: observability/grafana

+++ HelmRelease: observability/grafana ConfigMap: observability/grafana

@@ -56,13 +56,13 @@

       name: VictoriaMetrics
       type: victoriametrics-datasource
       url: http://vmsingle-stack.observability.svc:8429
     - access: proxy
       name: VictoriaLogs
       type: victorialogs-datasource
-      url: http://victoria-logs-victoria-logs-single-server.observability:9428
+      url: http://victoria-logs.observability:9428
     - access: proxy
       jsonData:
         implementation: prometheus
       name: Alertmanager
       type: alertmanager
       uid: alertmanager
--- HelmRelease: observability/grafana Deployment: observability/grafana

+++ HelmRelease: observability/grafana Deployment: observability/grafana

@@ -22,13 +22,13 @@

       labels:
         app.kubernetes.io/name: grafana
         app.kubernetes.io/instance: grafana
       annotations:
         checksum/dashboards-json-config: 323707a88bb7cc0dcc608d4bff3a0f3ff48479d8dd819198306026a56b4f985b
         checksum/sc-dashboard-provider-config: c942752180ddff51a3ab63b7d256cf3d856d90757b6f804cbc420562989d5a84
-        checksum/secret: 7cac78fb9a7c7a3115c304e5cdd9943221278add8629b65d5143a06b576e429d
+        checksum/secret: aea30ea30f0e41fe59d98412ed6f4fe6abb4e26e5cf1890ac3855bb187cea6a2
         kubectl.kubernetes.io/default-container: grafana
     spec:
       serviceAccountName: grafana
       automountServiceAccountToken: true
       securityContext:
         fsGroup: 472

@jfroy jfroy merged commit 11d27f9 into main Aug 22, 2024
4 checks passed
@jfroy jfroy deleted the vlogs-060 branch August 22, 2024 05:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
area/kubernetes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@jfroy