Merge branch 'develop'

Update redis and style changes

.github/workflows/chart-testing.yml

@@ -1,59 +0,0 @@
-name: Lint and Test Charts
-
-on: pull_request
-
-jobs:
-  lint-test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Set up Helm
-        uses: azure/setup-helm@v4.2.0
-        with:
-          version: v3.14.4
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.x'
-          check-latest: true
-
-      - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.6.1
-
-      - name: Add repositories
-        run: |
-          for dir in $(ls -d charts/*/); do
-            helm dependency list $dir 2> /dev/null | tail +2 | head -n -1 | awk '{ print "helm repo add " $1 " " $3 }' | while read cmd; do $cmd; done
-          done
-
-      - name: Run chart-testing (list-changed)
-        id: list-changed
-        run: |
-          changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }})
-          if [[ -n "$changed" ]]; then
-            echo "changed=true" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: Run chart-testing (lint)
-        if: steps.list-changed.outputs.changed == 'true' && github.ref != 'refs/heads/develop'
-        run: ct lint --target-branch ${{ github.event.repository.default_branch }} --check-version-increment=false
-
-      - name: Run chart-testing (lint & version)
-        if: github.ref == 'refs/heads/develop'
-        run: ct lint --target-branch main
-
-      - name: Create kind cluster
-        if: steps.list-changed.outputs.changed == 'true'
-        uses: helm/kind-action@v1.10.0
-
-      - name: Run chart-testing (install)
-        if: steps.list-changed.outputs.changed == 'true' && github.ref != 'refs/heads/develop'
-        run: ct install --target-branch ${{ github.event.repository.default_branch }} --skip-clean-up
-      
-      - name: Run chart-testing (install & upgrades)
-        if: github.ref == 'refs/heads/develop'
-        run: ct install --target-branch main --upgrade

README.md

@@ -1,31 +0,0 @@
-# LibreNMS Helm Charts
-
-Welcome to the repository for the Helm charts of the LibreNMS community. This repository holds all the Helm charts you need to deploy LibreNMS and related components using Kubernetes.
-
-## Main Chart
-
-The primary chart in this repository is located at `charts/librenms`. This chart allows you to deploy LibreNMS, an open-source network monitoring system, on your Kubernetes cluster.
-
-## Documentation
-
-Each chart within this repository comes with its own set of documentation. To get started with a specific chart, please refer to the README.md file located in the respective chart's directory.
-
-## Getting Started
-
-To install a chart from this repository, you can use the following Helm commands:
-
-```sh
-helm repo add librenms https://www.librenms.org/helm-charts
-helm repo update
-helm install my-release librenms/<chart-name>
-```
-
-Replace `<chart-name>` with the name of the chart you wish to install (e.g., `librenms`).
-
-## Contributing
-
-We welcome contributions from the community. If you have improvements or fixes, please submit a pull request. Make sure to follow our contribution guidelines.
-
----
-
-Thank you for using LibreNMS Helm charts! For any issues or questions, please refer to the documentation of the respective chart or open an issue in this repository.

charts/librenms/Chart.lock

@@ -4,6 +4,6 @@ dependencies:
   version: 19.6.1
 - name: mysql
   repository: https://charts.bitnami.com/bitnami
-  version: 11.1.8
+  version: 10.3.0
-digest: sha256:4b82fafdf2c4c72a003d1dc6df9343a089eb5d2f686927d134821854f9633c83
+digest: sha256:7b8a3f1182b70837c842c8a9fe7c1fa913cadd6800f1f780f94c357af7fca21f
-generated: "2024-07-09T10:22:10.255911997Z"
+generated: "2024-07-05T12:50:36.211666249Z"

charts/librenms/Chart.yaml

@@ -2,17 +2,14 @@ apiVersion: v2
 name: librenms
 description: LibreNMS is an autodiscovering PHP/MySQL-based network monitoring system.
 type: application
-version: 3.10.1
+version: 3.10.0
 appVersion: "24.5.0"
-maintainers:
-  - name: TheChef23
-    url: https://github.com/TheChef23
 dependencies:
   - name: redis
     version: "~19.6.0"
     repository: "https://charts.bitnami.com/bitnami"
-    condition: redis.enabled
+    when: redis.enabled == true
   - name: mysql
-    version: "~11.1.0"
+    version: "~10.3.0"
     repository: "https://charts.bitnami.com/bitnami"
-    condition: mysql.enabled
+    when: mysql.enabled == true

charts/librenms/ci/test-values.yaml

@@ -1,2 +0,0 @@
-librenms:
-  appkey: base64:RTMmh+i10E2RMcDxookMu47BTzJQy87hOU+k/zcuPnA=

charts/librenms/values.yaml

@@ -9,7 +9,7 @@ librenms:
   # Laravel appkey used by LibreNMS, a default is set for useability it is
   # recommended to replace this with your own key
   # THIS A REQUIRED SETTINGS
-  appkey:
+  appkey: 
 
   # Timezone used by librenms for communication with RRD cached
   timezone: UTC
@@ -20,7 +20,9 @@ librenms:
   configuration: |-
     $config['distributed_poller_group']          = '0';
     $config['distributed_poller']                = true;
+  
 
+  
   # Frontend container configurations options
   frontend:
     replicas: 1
@@ -45,9 +47,9 @@ librenms:
       #   memory: 200M
 
   # SNMP network discovery scanner cron job. This job is optional and only use
-  # when having snmp network discovery enabled. For this to work either set the
+  # when having snmp network discovery enabled. For this to work either set the 
   # 'nets' confifuration in the custom config on in the admin interface
-  # See the following link for more information:
+  # See the following link for more information: 
   # https://docs.librenms.org/Extensions/Auto-Discovery/
   snmp_scanner:
     enabled: false
@@ -63,7 +65,7 @@ librenms:
   extraEnvs: {}
 
   # RRD cached is the tool that allows for distributed polling and is mandatory
-  # in this LibreNMS helm chart. See the rrdcached documentation for more
+  # in this LibreNMS helm chart. See the rrdcached documentation for more 
   # information: https://oss.oetiker.ch/rrdtool/doc/rrdcached.en.html
   rrdcached:
     image:
@@ -95,7 +97,7 @@ librenms:
     # Extra environment variable for RRDCACHED container
     extraEnvs: {}
 
-# Configuration for MySQL dependency chart by Bitnami. See their chart for
+# Configuration for MySQL dependency chart by Bitnami. See their chart for 
 # more information: https://github.com/bitnami/charts/tree/master/bitnami/mysql
 mysql:
   enabled: true
@@ -103,7 +105,7 @@ mysql:
     username: librenms
     database: librenms
 
-# Configuration for redis dependency chart by Bitnami. See their chart for
+# Configuration for redis dependency chart by Bitnami. See their chart for 
 # more information: https://github.com/bitnami/charts/tree/master/bitnami/redis
 redis:
   enabled: true
@@ -117,4 +119,4 @@ redis:
   master:
     disableCommands: []
 
-  architecture: standalone
+  architecture: standalone