some small adaptions:

- curator cronjob via .lagoon.yml - statefulset RollingUpdate as this is now supported with OS 3.7
uselagoon · Sep 16, 2018 · d674773 · d674773
1 parent 8b30909
commit d674773
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/.lagoon.yml b/.lagoon.yml
@@ -45,4 +45,8 @@ environments:
       - name: idle-services
         schedule: "*/30 * * * *"
         command: /idle-services.sh
-        service: auto-idler
+        service: auto-idler
+      - name: curator
+        schedule: "01 0 * * * "
+        command: /usr/bin/curator --config curator.yml actions.yml
+        service: logs-db-curator
diff --git a/images/oc-build-deploy-dind/openshift-templates/elasticsearch-cluster/statefulset.yml b/images/oc-build-deploy-dind/openshift-templates/elasticsearch-cluster/statefulset.yml
@@ -109,3 +109,5 @@ objects:
         volumes:
         - name: ${SERVICE_NAME}
           emptyDir: {}
+    updateStrategy:
+      type: RollingUpdate
diff --git a/images/oc-build-deploy-dind/openshift-templates/mariadb-galera/statefulset.yml b/images/oc-build-deploy-dind/openshift-templates/mariadb-galera/statefulset.yml
@@ -108,4 +108,6 @@ objects:
         accessModes: [ "ReadWriteOnce" ]
         resources:
           requests:
-            storage: 5Gi
+            storage: 5Gi
+    updateStrategy:
+      type: RollingUpdate
diff --git a/services/logs-db/.lagoon.cluster.yml b/services/logs-db/.lagoon.cluster.yml
@@ -122,6 +122,8 @@ objects:
                 secretKeyRef:
                   key: LOGSDB_KIBANASERVER_PASSWORD
                   name: logs-db-kibanaserver-password
+    updateStrategy:
+      type: RollingUpdate
     volumeClaimTemplates:
       - metadata:
           name: ${SERVICE_NAME}
@@ -226,6 +228,8 @@ objects:
                 secretKeyRef:
                   key: LOGSDB_KIBANASERVER_PASSWORD
                   name: logs-db-kibanaserver-password
+    updateStrategy:
+      type: RollingUpdate
     volumeClaimTemplates:
       - metadata:
           name: ${SERVICE_NAME}-archive

diff --git a/services/logs-forwarder/.lagoon.multi.yml b/services/logs-forwarder/.lagoon.multi.yml
@@ -185,7 +185,7 @@ objects:
           <filter **>
             @type record_modifier
             <record>
-              index_name container-logs-${record['namespace_name']}-${Time.at(time).strftime("%G.%V")}
+              index_name container-logs-${record['namespace_name']}-${Time.at(time).strftime("%Y.%m")}
             </record>
           </filter>
 
@@ -205,7 +205,7 @@ objects:
             templates { "container-logs": "/fluentd/etc/container-logs.json"}
             template_overwrite true
             target_index_key index_name
-            index_name container-logs-noproject-%G.%V
+            index_name container-logs-noproject-%Y.%m
             <buffer tag,time>
               @type file
               path /fluentd/buffer/elasticsarch