V3.0.0

.github/workflows/release.yml

@@ -0,0 +1,29 @@
+# # # # Copyright (c) 2023, Oracle and/or its affiliates.
+# # # # Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
+name: Release Charts
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Configure Git
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "[email protected]"
+
+      - name: Run chart-releaser
+        uses: helm/[email protected]
+        with:
+          charts_dir: charts
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

.gitignore

@@ -1,3 +1,6 @@
+# Copyright (c) 2023, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
+
 .DS_Store
 
 ####
@@ -54,4 +57,9 @@ terraform.rc
 # Ignore util dir
 logan/util/*
 
+# helm-chart
+charts/oci-onm/Chart.lock
+charts/oci-onm/charts/
 
+# zip artifacts
+releases/

.pre-commit-config.yaml

@@ -0,0 +1,31 @@
+# Copyright (c) 2023, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v2.3.0
+  hooks:
+    - id: check-yaml
+      args: [--allow-multiple-documents]
+      exclude: '^charts/.*/templates/'
+    - id: end-of-file-fixer
+    - id: trailing-whitespace
+      #- id: check-json
+    - id: check-merge-conflict
+    - id: check-symlinks
+      #- repo: https://github.com/Lucas-C/pre-commit-hooks
+      #  rev: v1.5.1
+      #  hooks:
+      #    - id: insert-license
+      #      exclude: '*.json|*.txt|.*.md|.*.txt|.pre-commit-config.yaml'
+      #      args:
+      #        - --license-filepath
+      #        - ./docs/license-short.txt
+- repo: https://github.com/norwoodj/helm-docs
+  rev: v1.2.0
+  hooks:
+    - id: helm-docs
+      args:
+        - --chart-search-root=charts
+        # The `./` makes it relative to the chart-search-root set above
+        #- --template-files=./_templates.gotmpl

CHANGELOG.md

@@ -1,20 +1,29 @@
 # Change Log
 
-## 2022-02-07
+## 2023-06-14
+### Added
+- Kubernetes Metrics Collection to OCI Monitoring using OCI Management Agent.
+- Support for Kubernetes Service and EndpointSlice Object logs collection.
+### Changed
+- Refactoring of helm chart, terraform and stack/market place app to support the consolidation of logs, objects and metrics collection.
+### Breaking Changes
+- The refactoring work done in this version, may cause issues if you upgrade to this version (v3.0.0) from previous versions. Refer [here](README.md#2x-to-3x) for further details. 
+
+## 2023-02-07
 ### Added
 - Create a new mount (rw) using the value provided for baseDir.
-- Expose "encoding" parameter of Fluentd's tail plugin as part of values.yaml, which allows users to override default encoding (ASCII-8BIT) for applicable logs/log types. 
+- Expose "encoding" parameter of Fluentd's tail plugin as part of values.yaml, which allows users to override default encoding (ASCII-8BIT) for applicable logs/log types.
 - Partial CRI logs handling.
-- Oracle Resource Manager / Terraform support for deploying the solution. 
+- Oracle Resource Manager / Terraform support for deploying the solution.
 ### Changed
 - Modified /var/log to mount as readonly by default, except when /var/log is set as baseDir (to store Fluentd state, buffer etc.,).
 ### Breaking Changes
 - Logging Analytics Fluentd Output plugin log location will be derived using baseDir instead using value of fluentd:ociLoggingAnalyticsOutputPlugin:plugin_log_location. The default value still remains unchanged and is a non breaking change except if it was modified to a different value.
 
 ## 2022-08-30
 ### Added
-- Helm chart templatisation/parameterisation to provide granular level control on the chart and its values. 
-- Support for custom ServiceAccount. 
+- Helm chart templatisation/parameterisation to provide granular level control on the chart and its values.
+- Support for custom ServiceAccount.
 ### Breaking Changes
 - If you have not modified any of the templates values.yaml for any customisation including custom Fluentd configuration etc., then upgrading to this version is a non breaking change. In case, if you have any modifications or customisations, then you may need to adjust those according to the new templatisation format before upgrading to this version.
 
@@ -35,7 +44,7 @@
 - Pod Annotations based customiation of configuration paremeters (oci_la_log_source_name, oci_la_log_group_id, oci_la_entity_id) for logs collected through "Kubernetes Container Generic Logs".
 - README update for custom configuration documentation.
 - Flush interval and timeout label configuration for Concat plugin section.
- 
+
 ## 2022-02-24
 ### Added
 - Oracle Linux 8 based Docker Image support.

LICENSE

@@ -0,0 +1,27 @@
+Copyright (c) 2023 Oracle and/or its affiliates.  All rights reserved.
+
+The Universal Permissive License (UPL), Version 1.0
+
+Subject to the condition set forth below, permission is hereby granted to any person obtaining a copy of this
+software, associated documentation and/or data (collectively the "Software"), free of charge and under any and
+all copyright rights in the Software, and any and all patent rights owned or freely licensable by each licensor
+hereunder covering either (i) the unmodified Software as contributed to or provided by such licensor, or
+(ii) the Larger Works (as defined below), to deal in both
+
+(a) the Software, and
+(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if one is included with the Software
+(each a “Larger Work” to which the Software is contributed by such licensors),
+
+without restriction, including without limitation the rights to copy, create derivative works of, display,
+perform, and distribute the Software and make, use, sell, offer for sale, import, export, have made, and have
+sold the Software and the Larger Work(s), and to sublicense the foregoing rights on either these or other terms.
+
+This license is subject to the following condition:
+The above copyright notice and either this complete permission notice or at a minimum a reference to the UPL must
+be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.