SO1S-231 fluent bit 커스텀 설정

apps/dev/app-logging.yaml

@@ -10,7 +10,7 @@ spec:
 
   source:
     repoURL: git@github.com:So1S/deploy.git
-    targetRevision: SO1S-209-log-수집-툴-prometheus-연동
+    targetRevision: SO1S-231-fluent-bit-커스텀-설정
     path: charts/logging
 
     helm:

charts/backend/templates/docker-pull-secret.yaml

@@ -7,7 +7,7 @@ metadata:
   name: so1s
 spec:
   encryptedData:
-    .dockerconfigjson: AgBU+Nw3MvXqyYHMJ4YcXqQ7fr0CtGvYykYCnZ7m99Yl1hmR/K6T6Ok+QNyQ37G+rWPRN4HmULVjjnyByD8onNd1w7BQwlHoq8qk4rCdAutAkkTbEp5g9uhFQ0XLEMKTBVdobPRRS4iR9/Wu4LOmhYa+ExM5bTDjWDRcgsA3Z/EhFd7vPhWwsOpj0qocq1l7RFzj6b7S8f496e3jKj+Ixb4X3PoE7UZX2Ebyl4AviQw0N7xKiyF1YKP7EXl9cP+DXXbS/DDaKxB/wp2idiM1rYfd1lCX2L7PLnrvVZrnlZWly3KrihQx8uvTwUpDIPO4rkAv7+PscqIQ3wceLenC3n1jL46I3Lof4t8E3sCmLeM5IiHPkRW/JBp9RcDexNhqdx67ncQ6ses1+vSRvKMn7HZdU3Cvb9P+TQqO3mMo1mheFwD7D5WleoOXPArJ43xol5r586z/8wuo1Y+Z7sWEvXUyhUMrOZY6obnEvq+sYKRmVmX3HJUiHge8VSa3sG4VEOtI8/TaCITqbPXgWcqkOMbygok89DVY5INfyDR2nxCsjX9j4ifCTpFg6gshJC0nZU1m7HoGluNisyt4V4eK78lrg2T23NSTh6bjGC06sa6MqvvENaOniGOmatEc9WdzG3EEAlQOdaYBhQeyTiSaqWp2TnD+IG2QdtfgIiBXuAZOzRDuVFtEePrdSnWakrI3EWGb3GcyDHPu/lKOHJzJBUqH11czsR7wZH1hZz0wIL9eIfsef+UatW5e0g/bqbaK0d/ALwNBGSuHfOy30OQ3HZqOgJcH/O+komWGPJwuKwYV8gxLTwtv12RfuTRMBt9n1enV7uLSHSs9lSpItug+pA1B2KWVePyNgN174skJ5avHl7oOJN2oHjk9jedLm364E/KUMy6Ht4vALH4tlCfBEbc5CdOHeuluxlKV0gPeGJEyTWM0GNyPmmuVdDFtSaCHy5446tsrEOFXCGuM
+    .dockerconfigjson: AgClxu4N9I9ExoJ99+avj8gizY/l4eJFOl6cn+Y8bMlCsfm9tEq5HYSKSxIiRwa8cQv9yFY67Hkubts69tEP3fM+N6wmJ1y+KY0KaeNFTqlKzQC1y0RH1u0kEBYWGdoP8feDUDmsoXd7O3yBZy7kkstMMdATm4zTBZQtjgz7fqZH7CjIDxCarW0J947oDNTqAiq6jXCbX65/OE8jX0EXI/YFPpUwbgKoEwJX9+/FuqsKoqkiwSxEbMUXTNOTtefXcSJBn4r9LLk5xUNZBNjK2ND98jab9I/W+HRfetQsn7kqSvb3PebeyQ9fpWZTOIG5Aj7diwm/Fw2uKiT6XOFW5cCx8uJpotkBQsSrEXA522LDxEKFMHy5DSEh8KlLHb4zwfw0X0CUhpNNw3RlJFipqHmny+5qO4rT/rQAg48Hqvj/FnjRa5a84ZpbFanKO0SJqVTdwH+5nUVLuNN8l8MhlqBYTgKLiwMfIi0c9tpGlK2VqMYZIEjUF4dFugEgKMXxdfrEIqipdvEtchOEAawDYNbJu1cTsGW8gM/B9lKNbTmt+1pP6tFInHHHoUFfNN3HfV7st7WTGBbozh5OHXa1miRGrKMRodEavCYWsVrmAqoRAYYJknMnvpmsapDFoWpB1yuGNfELxAtIRJWhsjjisD7yuPIyZosskgbBZQOlyhi4jDSXHbj5cXhmIcICrRMFQmJ3lXdmSLd+AUgHAO5eDbeTh1NWtRr5C0vkzIfoKj02QtxGFCjBhQWosnh4YIUkCraHfa+egNgsMbWSIwBlLXgS8aFNBS7w7OLOER6v53Be+EkXkDetnq4gGjqpXm9lYfWK+CpCOORL2IgmzNeeCGLkN3vyUSddiNXh/K1oOZFG81fjh4h9JPVubNN06kwqCM3ew/o/92CA73I5oMEQBQPgjOEJWM/q8tn5cEkQB09E1Ibdlh7AqPDOMueSTa5v+f5rleJnp1NvrULg
   template:
     data: null
     metadata:

charts/backend/templates/sealed-secret.yaml

@@ -7,11 +7,11 @@ metadata:
   name: application-secret
 spec:
   encryptedData:
-    aws-region: AgAknOfYst0NBR3iU8AZMqC4I2xJmszZxxAP82TMOeaUBm8qqT3VYJf5FdmJnJpEfuvIhNu6F+EHFjkVzUK5PwnybNquU3CLAMjfsw8nWf+ZLliJ7b0Mvy8ukoVwwpCUOcuPJyDFmtSsWwRioW14mMXGGG0gnKHj7rndBEoOAsQgxoJ6fQamJkvYUDUx45CCRBYR8pyoTym8GRP1LjP5PV1JWIB3oDKsUJbm5PiHOOQ+KR4UARBwFGWqaMTkM1V8fKglh7z5Y2o7luNDX0FJi9eU/mqpEV/H+zISSqiFLYpdfhv8qkg/9ltCUvPY6hjZj/ubpRe77rgzSbxutlnSqF72OSMZyubdNpJLQstg5MptszGdJXv6qR63+8cZUKBCqizyUUmYQzbynKQJ7XwhObBnk2MfrwKAkfTJCvGML/HNIhKTOeGsYiD2rhbxwt+TF+gHyqZuIgpJsC+B91iJDYw+PnNABTOLw788A4b1VukjvTRvk1dwkEfwahjFK263dtnFlefAxh+IrL15WaLyzoNm0uBR4ckPDFs7mp/KuLSz1VqUBn5/awZdtDEYY+3PQuWz3ijMxNgwgdCveo3rYgFrTPBYXq7hTSbig9Mmw0pgNFE2/81Dfa4kYhE16CFmqn1jAujk5SH9GgJxxWMUYqPvwuM/+ZHZPyRmsdOkUW4QUWZdxobSjhrY5xJl4BqxpkAh3uAL9SknLn8WqQB3mQ==
-    aws-s3-access-key: AgCM444q/9WDl/VZ6r2mwxEY8X28s1rt5yezWIB72JHbq/k2rhAmN7wXi4ZOstdPYFhFJHzz3DBDbqvGb9HF+QDshY9gN0aRU26q2GD2bO2oon634tFpCp3Kf0ZiB6/S5l4VM2P+G9G6ZUGnbIWXTf5PBsVUy8sttwXvTAnNUmAQG8k4E6JAzYo2c0QsdRUqWVO++rPuj2e8H90RhkAjqWX2KOOUXQf2vPvJ0ZpFDJFP1XOPpCyn+VBgizClruDkQVqDJDtce5hl8h9unC6q06Gfr3mjmspVchRhrKb8oXo09mIc40d0S9yj7MUkg/RsEhf+TRIZaPcvG3dNYfpFkoLG3dg38fC97Mg7LS85M1Rmb8g9PFBfJPld7n9wEkpU53+FivyLXWRph2fS18BPyvFsrAOcvgETrdUapDC1ByssPNfxSLpfviAhCUPB4rbJfYWZQ66ZdPjhWskN66JieXwVGflq7boUcLL7We/A/e2UzdLT3Aeel/MZC9sEykF5gRvi4D74BUQnfLhMICH6wO+YuGBciTVO1F3/28Gqpox1VScvrolxoQJXX2EnKXUpjYGr8x8BOmO88yDNphpdK/PI0IGydA9eIlMQA1sFtQfL6ZQUhvYUuhi2E1Z7+U9HBkJ0SVFJAZOAi8EY/HAidTZ2j7tO+E7ktafJusWRZtaqg9nDM7fi+vScbqwvnrqVmQBFvvwc4jwKr7REzG41JpHkai0xlQ==
-    aws-s3-bucket: AgBZ4muOrByMj8XwNGpCFNhmKiflFbqd3p3UjbtHEhYafnedR73jlTdsTWtdKs5Ttn4sR+IJ7spxfGANgySUZhtHjL5ldR5vxTk2tDPJ/sM6VQTRpWT1XPe5plIFZNeW4aYfgBvhWF51WlXNIU73pJOD64CsPLcpD6iGEF5BIpePzfjNCpyju2ZrM055SHg2Bj+7vkHINBzYisst6otJJf91IJgtgIV3YKWIevjwHqeH3o5qWdjpLyMSWzE0wQgbi6CF/Ve+eOd8wWnufvrUe5VQe83bR10vI94fdO5RsaaM5Ih+UYL0fG0Lt0bhBmUFHWY8YOeGBwpWguoO8T4nfaAbkqZyGb7rpMTDFmhn9EllXYxQapNoyiRglOzcBWC+qmcUYAyDPrhsNKePLVd6lUqPamYzpP50ZbJIgijvQGD7jEzG5dWe+1j8H3c7udfXSZTVJDk/hbZGUewg+OD2j9+bV3as1Tx0K59ykokIYFUGOEjV1MhJwJwdKv5j5Kx6zlj8gWhf79tu9KRMmYCeDZJs1fiaVY4+3/A2gq58hoVTTayxFjeNBT3oWy+qilOvRKrDU5aT644mMpGB4n9Tc9cvvqJfcXS/uKx55tEn9pZ3ec6XdxiJ/L4tQbC/KXXGKDs8+KAjgm0pOek677Dawz9lCaBH04gQqhGcBVdSbP4SOU8yan5MS1/PqaAP7qCPKf0dpfIb
-    aws-s3-secret-key: AgB5V0Nn1+eCN0wRi2hyWEMjVmKHwEY21MwXYrk/MnE63bCf4ihXL5yqUrjOsfdbnh9+wMizivtGhuJOflHsH7FHQe7i1EPTlbJCSSPg6WPzMjUCPwwo9WrIhdd/6x9mjWyyeQs1xNr9iPk5MSt9Gm+Ra5+szZY4CkyG73r13cbFQkgiiygJQl7oXpgOhglXBMJl7pAbUbibHilTJUFb/RvOpbcNHk1KRYyuum9F+CPTfe9Bf61vlekG5aF58D9z01DIkuCpZXC9jhg8v5r81L3cmm0EzWqCwWWVU4ZtyBZvKa3/Fdxz5lKcIxfMbI+T3F8UEiGO5iJOse+H2cJTp2RsMnNppeJXwRQq5ArvZbthI/L8DfCJh/K9pyV+rV5s5hOs1dpjSgj+BeXB6krWRkQHmNYGd4u/UCxoX7WXeUoMsqYkqyXsIOIOdcdJMJ6zsZPgmyaYua3vpt0zEeCow5+FXc0mvx3iaofabT+dO8wo9r6Xx8LabKrE+isV0Dz+DTD0jdQBUGPRBG7FnMLX/loDVhcVc/aW465pI+AJ9gnmMgvZS40IlnBWCl20mNaKTuGXJJ724+nkxVfppEBJzUlK5PruQFV2pPPkAQphslP3WcdYZsNd7bmcITAYnrJ7tdeUJK1oKvL2tDSP91mdpSbpNhCB7v3v9MwjF29dwCpzojaF9yEPehDFBFipfJIQPZOgikME96Ym0fjFu2Ag7imimgnASPXfH2Ha8WfxEqqkvJpFUS5FyWRC
-    jwt-secret: AgAVoo3D9seWVbWEl9C7fIQwndWI/FFWYkR9VPoZatm5GSUFYUrjpVs/uMLorbWyYdruu39Ysip69Bdof8pIeiFSbToZAfEMZdM7rED7PZcr4TpGrcuk8sC+evCssvx/iYkUIb+OBH259FIIdexdRcKJ541Tp+Wo37qaOrM695Jp56xFSiC9DXt2vRE1Ru6zNatlTNFmfEE8xJL2ztDDeeJjMbU7YPSn+K2avj+mQxf0rblnF/jcwzbbuolgblZMG1gdfDTxRmIkbeS9R/zAJ4DPXHeeTf/Fhnp1VHwpLTvsbvNaDu7zwkjo5WVT73pRRLsW19puc7kEk4Dbfp3wU04elJBfDMKqLo5HMu9dLkW5TnFVkKu2H6wxVxGfwJFsKE73LPx4Ve3JzG2m3NdJpY5fraKA26uD4E9r58L5/PyMboksK2N0i/roJjZ3PRkOce5gtBEPXMpyxYrLKmm94pD7u0q3cxlCRhG9Xx+o99uqyGRrT/veUH5BfgUFG/eKLQ9zsCdlsXhPC2r9f4nunTno6HNLNkJFC6LUMYfoihITqpymz6VeciNplH4rT8vHw0J1xUcjx7XKzTHbukDJOU3XRODT8pbI8V3Zb6Hp8G9ZZ2diIcyukmOB/Z6gKQXWAXHGX3OI0VAJQ1ujrzoGcy1MF3r80bVT9LnaKIZq3JOhmuHCXi/LELnlgtDENH8jrO0rtE5JRh6C2eG+9RSX9Z4bUfLlkmJOe7PN7urHZ5Q7uTh689RgHKfQAOggTPI9Kri8xrVwwgRiNC/uPqmKm3IbNceh9eyULLLokFhErvl4RpXrKV+iKtiIQXkiwaJvrwKOGvbOdmzkMzL4DoAKuUzjSaIrzgjYCnpSLYNyBnaoYPNjWUq7pl5ck2/w/wbC38u1cks1AycJmf2Pcr3r9DrC6IYOp3pH84elen0FUe/0jnyDYtkNjaLNPLYSicAEYjKH3vI6546nHUhL737u62AHaJGRPnWtSgEzt/BWBn3PjaIeXKykOuhKmMgVEdLmc/0/Bo/f6Q+3vVesGVYku3VCuR27XOWUP9BeYyOzaK1ePXS1ijSqepooUtL4lrH7iM3k4nz22JdySyS0hH4=
+    aws-region: AgAT0Ia5Z3ezxv3Kd3MgS5M+mqUY8GYp4NcKj8gNyL6PEdu2bbzK+4jVAVwc2BYFb9ST6mdHhQew1gTQk06juNwBcVEI/fpkXQHMfO4D+gWI8OFa57qMzBUiqSEcsIjJiwmXKGFJuBUrHGrQH4cwDHyQzb3jAuzsYTVZoB0kdtEgThF9gbgs/RQCVb+hqUTk/3lvC/rS0fyTmlcMe2svU42yDT4jlmDaUipJZ5AaXxSqOHL5UGeiJiIOThvwoohdjaiPP6+ZiBPAhFlRLn12I3x8O9YlNrWwD3kH9n/yOq25iFjUlh9aBAdW4FrFbDp5wvZP1UAfbafUiwS8mKScZE2KRY3e7zWVOb1dRuL6U+oCk8EZ0fB2Y2RbRYat9UNUg8HevwB8ApNAPQdVYLKH685jYd0Z5LVZqHxOn68Fifa2pPr3W1QBd7cvgGnAEBaKMZHoJTuJ5E1lbgrHH/1NiJhshbh8tkvZGVnW/KzEVRgkI7U6d/MowdhVrdAjXClPgKbbZaDCDfgkJ4zDaFUdYdfJXlzVbZDjDxQ0kWvpP8eoyFtrBsot2/T2Jp2AjvvAW8pbnsd4ctripWkS1k58tDixLQBqWprvzmkr5MuRAB3aGN+/xepg2QNbmiOSCkmVwglfzN3FY/eFKsZHDb8mZ2e99Mlyd4GbLCJ0WSpRuQKdFGiOBcS+J15x7lrKgIdKNlUZX/p4VSDN0DFptA10DA==
+    aws-s3-access-key: AgBvbaedEWsVTTwyGqDxtK6lV9+vZjixB7OJ7HFAmsFl7LKZpOGKZLLPVCvH/nAxFUf5HKndHMlrD7YlfKwxIGZinQr2Hq0QaU9F9FV3G+KjvMV4Cz4m/2ZTqfBrCH39O6tfCzk3KpxqKvIEHRQmlciyiKZe09st78AdBEzf9B78hXwO3sXjzXQ5WoOuIlVmYzXh5ByesMAxwN3jPdDeLslIPyeOdWRNGYP+cVGLuS3GBp35Lo3F6NpKM7xkDRc3DRc4xcvCBkXUAAzvwEp8TBigf45Cpr3psgSkB/krWS71MRbcOuciSido+acB/62au6FZAzJeyihRmohW6L3Alc6+xD808ORNBb8c8lw9sCVo2+Np7mMRvOim1RSlx+KauaNG1JXi6LHzxj38Wn1vuhUHiwkUyNPsL0mN8DQfrtFTgUu2HnPFVVE+t88P/lJizU62Yzd7mDvPORths4J8sI+xcA2yenzMw9mxQX50mYvpea69Ut4n1v2lRL0dpZ9vUzMXMj98k0TiTxLDl87PQGvqxbQTBBMNv2ruSXcAl+h5prp6ujL3BRhEDBZIWPyqlLUxdLJtHpKaWQgNjUkssssL1KXIl8Q1VgWpLw4DZW3LamJjcYa01OV/EZUcBqMIRIfaJHLuwefSjeyVZnzv5ML7gLICVy9dN3SEGOLPT2pOeasjItKMuNCoPct3kSIHyk/T83Wml5eIQ6a5p69/axtCPnhSLw==
+    aws-s3-bucket: AgAm+P2cfA5/TeyuAtRztRvaCLWhXu1kbu6rHiRR7L33e0aRX1K+U6uYL73lN0asBQFS6pYCHAmBtxTbSwyZW9qOvAWFawQ0RKZM8d32I+a5En9U90MWoR8MiidJKhJHJ7qHm5e3uaOuUmWqixJVKRflB9Pa9Gds+Qzo+2S+JntMKH6Lx+2Bas/xwtz1+1n7SJuJypU/MqlsCpPxx4TnKik6MeRmKtJT2wntOacWqujMfPfl4mNsH4NQQb6Kt3bTrCYHXWjw+yGRUFD1hz8QZdSmZazlyEqFe/bEln5ovpVTD1prS/vaz72zQZrEAZHsg8NEip1+7trOkazKQCuiAKZpCExrG1B6fWmAJcuet4nLJNf24LsQ9DtyCiFiOIoQOzPhP10QkGm50gGO/2um5bPeDEz06qn6F27aoWj2sCaA/CgHfz6/RmWw8tvXw1aoDEDwRRVqaIVZ0608tIoG6X0uQdMjCuGANeBNw5+drLJ0zidnBlFwgb104QrcW0AnO6eMoWp3s9vtkQvFMP/ionR5zzF5J/L1eE4Y+ppyZ8IhHWLsfNLIZZsCj51RmhpTJY91uv6pA0I0M1la5pxxFu7J99JiVbiDaydxWAoIQ5LyZiHcsKv/Krq1QNZIzNWrqTGeAD4PMd7pkWFtkokHWQXPpAi/0UpAmtnGSv0gxKvES+rp9bnzmL88EpR3fmQ1Q4Twgn/A
+    aws-s3-secret-key: AgCegma967HEBTvvSa7pQF+Kj8e+3atcH6IMJiAeRUrQ7YXgyYXht05GWsMLon2/6XUfe2qD4/0cwd7T7i6VMevAH6rI2k69BKioTaVfvvtAMT2TpPbxXzBFwjQhiMjPqBl0W9oYkOSaonYEbLGt/RfclCQw4ZBEsSSxNSirhVMAt8+dMMq68qQ7jNkVSLSME8Wscnn7CvbSONmDVoYCZs6jXGjfPmLCI2lh5K37Qn4BJZqslOE/LXLwCuiXlIvt/e2WLNhv7jRqVBAUbKnkcHIObBTp/sPw5f0aszCpuEzUrk7hMDjDthazjkArzRD3SUof/ytiLGRwW3YHAPyxybKVWJW7M5Ph9gMmpwZew12vFURizRbj2In5vXY/qjUqE3JErQyO+Euzwbk3Vcb3zJh32cJedoWL9EoHbGlgF6P4+2Z/Wh07KuBcOCq5tQPIOlZLreB7UMl0uqABozX4myEt9kWhbMC30a4JHpK8/M6C5JtErbAEi+voPJ2ApWvdMDUff5bKj5ozVKXdT5kbhr14baqMynHC1czykXzzKDcqg1pBh464Wj+AQARMa17nlolwcM18EmxJ2594k+aXxJh/iG4ltzPyZWeBdOF2fH4MfTkaCEsU5FgxbSkAtWcUeu2Dr+8j30mreZIybi/Y09vGcizDZy9scU3i1cf6w2eK8BEwEFYIfGSYItj1n17uQsfqdpIok2LQX3EPHxDAIwyewnIcMhM3Xq8ZDQAc11cu/CEa0JyZVhCT
+    jwt-secret: AgAlQJYP7S9qNGv6S8fH2GHE1jdjz2TBXfkDSGBsvRdGQ1pcXV4Kill3MufhkTdr8HV5DY1b6UoY97+pTsp6f1iWDWKljpMH4FgSrI0UL66NjXibInTaycj2v3196KQb/l7plVx/8LvK1y6neAWLwuIZ9QSfGujNqoG1REf6ozb5bFqbc+PtM0D1byJr7uVxspgVJcjkV14lwpNwcwqLcaXgLdnGK07pBo3MfWY2RB9lMJVpmc4FsH2R3IOPs8Ebxb6Z+nQiAtf5fgIpbuZBJ/x2rL0nuqf8OP2AYTxWYxTCdlsKxHpUKnAwAB9eq47FyELsXXLBHVNn7pvB67dlwxSb1Y5cBcdWChrsPwFyfNYOElqzgYHLdTKZ8WFdHIFYAM2X2zEHxpxfhydjJhZUYpY2CKJ09aseotYZbN/k6f0ACxfdWeG2mq6xqanw4/CMJsQ/XVgd4u26qBdXMYK8MRyBiIouSftNAeY0VLRsoKLvHTunurAGYxkJpOZmCbV+EINjTZixjR1Jqbhvc7PPASpYf2J12A+ESyEBGt4O7juiPHmNaf5GaoU/I5B3ZmjJDzvS5A92eZy4yBJTogwchO5jLiunCtXJjcCaadV5c2aP25abBORfnbEMAuDiC+QFlkIoybwDlFOihb/PSNxMitWd0cG5EyJID1CjZlIwFYom2jQqXnL5ACf7pOhOPTd2hFtGRk0IMMt4WFkm9CXQv5iFYtToy3gCregvZicxHpHlNRHbH5Et/seKT08+bybwoT5Z/IwRV4xah77kr0GQc1YIlBdnAhKE8oqvlrK2xKFQZwmMDkfp5TM2aDMw3HUUlrk6fw6lk3IDzZFIE/0xglYuDyTjeDssIgWHGr0Z0Jfcsgs87UV0IMQfoIcy2Cf4bUyMvN/TXzkS39qfDYtSiVsMSgZmVpkQ3oFXZKxkVTmmr74Ri2pOLqJersQRdf4S9Kbkv0WlsNgwYSFj06qJc6pnc7mAgYix8sNtozdFl8J/PA9LqQErrXmP/mWOigY6Q80upcPbF7SfzMI4E8fjGO58TKim4zrZEk8+oIpfwy+fw0vuOQCGIghDumOhuoSWe9rT01yyaB1zsRAFQVs=
   template:
     data: null
     metadata:

charts/logging/dev-values.yaml

@@ -13,9 +13,29 @@ serviceAccount:
 
 additionalTolerations: []
 
+serviceMonitor:
+  service:
+    type: ClusterIP
+    port: 2020
+    targetPort: 2020
+  enabled: true
+  namespace: monitoring
+  interval: 30s
+  telemetryPath: /api/v1/metrics/prometheus
+  # Set labels for the ServiceMonitor, use this to define your scrape label for Prometheus Operator
+  labels:
+    release: monitoring
+  # Set timeout for scrape
+  timeout: 10s
+  # Set relabel_configs as per https://prometheus.io/docs/prometheus/latest/configuration/configuration/#relabel_config
+  # relabelings: []
+  # Set of labels to transfer on the Kubernetes Service onto the target.
+  # targetLabels: []
+  # metricRelabelings: []
+
 awsConfig:
   cluster.name: "So1s"
-  http.server: "Off"
+  http.server: "On"
   http.port: 2020
   read.head: "Off"
   read.tail: "On"

charts/logging/templates/daemonset.yaml

@@ -73,7 +73,7 @@ spec:
         - name: varlibdockercontainers
           mountPath: /var/lib/docker/containers
           readOnly: true
-        - name: fluent-bit-config
+        - name: {{ include "logging.fullname" . }}-config
           mountPath: /fluent-bit/etc/
         - name: runlogjournal
           mountPath: /run/log/journal
@@ -94,16 +94,15 @@ spec:
       - name: varlibdockercontainers
         hostPath:
           path: /var/lib/docker/containers
-      - name: fluent-bit-config
+      - name: {{ include "logging.fullname" . }}-config
         configMap:
-          name: fluent-bit-config
+          name: {{ include "logging.fullname" . }}-config
       - name: runlogjournal
         hostPath:
           path: /run/log/journal
       - name: dmesg
         hostPath:
           path: /var/log/dmesg
-      {{- with .Values.additionalTolerations }}
       tolerations:
       - key: node-role.kubernetes.io/master
         operator: Exists
@@ -112,5 +111,6 @@ spec:
         effect: "NoExecute"
       - operator: "Exists"
         effect: "NoSchedule"
+      {{- with .Values.additionalTolerations }}  
         {{- toYaml . | nindent 8 }}
       {{- end }}

charts/logging/templates/psp.yaml

@@ -0,0 +1,37 @@
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: {{ include "logging.fullname" . }}
+spec:
+  privileged: false
+  allowPrivilegeEscalation: false
+  requiredDropCapabilities:
+    - ALL
+  volumes:
+    - 'configMap'
+    - 'secret'
+    - 'hostPath'
+    - 'projected'
+  allowedHostPaths:
+    - pathPrefix: "/var/log"
+    - pathPrefix: "/var/lib/docker/containers"
+      readOnly: true
+  hostIPC: false
+  hostPID: false
+  runAsUser:
+    rule: 'RunAsAny'
+  seLinux:
+    rule: 'RunAsAny'
+  supplementalGroups:
+    rule: 'MustRunAs'
+    ranges:
+      # Forbid adding the root group.
+      - min: 1
+        max: 65535
+  fsGroup:
+    rule: 'MustRunAs'
+    ranges:
+      # Forbid adding the root group.
+      - min: 1
+        max: 65535
+  readOnlyRootFilesystem: false

charts/logging/templates/service.yaml

@@ -0,0 +1,21 @@
+{{- if $.Values.serviceMonitor }}
+{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ( .Values.serviceMonitor.enabled ) }}
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    {{- include "logging.labels" . | nindent 4 }}
+  name: {{ include "logging.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  ports:
+  - name: monitor-agent
+    port: {{ .Values.serviceMonitor.service.port }}
+    protocol: TCP
+    targetPort: {{ .Values.serviceMonitor.service.targetPort }}
+  selector:
+    {{- include "logging.selectorLabels" . | nindent 4 }}
+  sessionAffinity: None
+  type: {{ .Values.serviceMonitor.service.type }}
+{{- end }}
+{{- end }}

charts/logging/templates/servicemonitor.yaml

@@ -0,0 +1,49 @@
+{{- if $.Values.serviceMonitor }}
+{{- if and ( .Capabilities.APIVersions.Has "monitoring.coreos.com/v1" ) ( .Values.serviceMonitor.enabled ) }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+{{- if .Values.serviceMonitor.labels }}
+  labels:
+{{ toYaml .Values.serviceMonitor.labels | indent 4}}
+{{- end }}
+  name: {{ include "logging.fullname" . }}
+{{- if .Values.serviceMonitor.namespace }}
+  namespace: {{ .Values.serviceMonitor.namespace }}
+{{- end }}
+spec:
+  endpoints:
+  - port: monitor-agent
+    scheme: http
+{{- if .Values.serviceMonitor.interval }}
+    interval: {{ .Values.serviceMonitor.interval }}
+{{- end }}
+{{- if .Values.serviceMonitor.telemetryPath }}
+    path: {{ .Values.serviceMonitor.telemetryPath }}
+{{- end }}
+{{- if .Values.serviceMonitor.timeout }}
+    scrapeTimeout: {{ .Values.serviceMonitor.timeout }}
+{{- end }}
+{{- if .Values.serviceMonitor.metricRelabelings }}
+    metricRelabelings:
+{{ toYaml .Values.serviceMonitor.metricRelabelings | indent 4 }}
+{{- end }}
+{{- if .Values.serviceMonitor.relabelings }}
+    relabelings:
+{{ toYaml .Values.serviceMonitor.relabelings | indent 4 }}
+{{- end }}
+  jobLabel: {{ default "app.kubernetes.io/instance" .Values.serviceMonitor.jobLabel }}
+  namespaceSelector:
+    matchNames:
+    - {{ .Release.Namespace }}
+  selector:
+    matchLabels:
+{{- include "logging.selectorLabels" . | nindent 6 }}
+{{- if .Values.serviceMonitor.targetLabels }}
+  targetLabels:
+{{- range .Values.serviceMonitor.targetLabels }}
+    - {{ . }}
+{{- end }}
+{{- end }}
+{{- end }}
+{{- end }}