Merge branch 'main' into deploy-hybrid-fileshare-access

Author: kcantrel

.github/linters/.yaml-lint.yml

@@ -0,0 +1,15 @@
+---
+extends: default
+rules:
+  line-length: disable
+  trailing-spaces: disable
+  truthy: disable
+  braces:
+    level: warning
+    max-spaces-inside: 1
+  brackets:
+    level: warning
+    max-spaces-inside: 1
+  empty-lines: disable
+  document-start: disable
+  new-line-at-end-of-file: disable

Monitoring/monitor-ontap-services/README.md

@@ -23,6 +23,16 @@ Here is an itemized list of the services that this program can monitor:
 - If a volume is over a certain percentage full. User can set two thresholds (Warning and Critical).
 - If any quotas are over a certain percentage full. User can follow both soft and hard limits.
 
+## Architecture
+The program is designed to be run as a Lambda function. It is triggered by an EventBridge rule that is set to run
+on a regular basis. The program will then use the ONTAP APIs to obtain the required information to determine if
+any of the conditions that are being monitored have been met. If they have, then the program will send an SNS message
+to the specified SNS topic. The program will also send a syslog message to a syslog server if the syslogIP parameter
+is set. The program will store the event information in an S3 bucket so that it can be compared against it before sending
+a second message for the same event. The configuration files is also kept in the S3 bucket for easy access.
+
+![Architecture](images/Monitoring_ONTAP_Services_Architecture-2.png)
+
 ## Preparation
 There are a few things you need to do to properly deploy this script.
 
@@ -279,4 +289,4 @@ You may obtain a copy of the License at [apache.org/licenses/LICENSE-2.0](http:/
 
 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" basis, without WARRANTIES or conditions of any kind, either express or implied.
 
-See the License for the specific language governing permissions and limitations under the License.
+See the License for the specific language governing permissions and limitations under the License.

Monitoring/monitor-ontap-services/images/Monitoring_ONTAP_Services_Architecture-2.png

@@ -1,3 +1,4 @@
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -20,26 +21,26 @@ spec:
           persistentVolumeClaim:
             claimName: rpc-app-pvc
       containers:
-      - name: nginx
-        image: public.ecr.aws/nginx/nginx:1.23
-        env:
-          - name: POD_NAME
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: metadata.name
-          - name: NODE_NAME
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: spec.nodeName
-        volumeMounts:
-          - mountPath: "/log"
-            subPathExpr: $(NODE_NAME)/$(POD_NAME)
-            name: task-pv-storage
-        ports:
-        - name: http
-          containerPort: 80
-        imagePullPolicy: IfNotPresent
+        - name: nginx
+          image: public.ecr.aws/nginx/nginx:1.23
+          env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: metadata.name
+            - name: NODE_NAME
+              valueFrom:
+                fieldRef:
+                  apiVersion: v1
+                  fieldPath: spec.nodeName
+          volumeMounts:
+            - mountPath: "/log"
+              subPathExpr: $(NODE_NAME)/$(POD_NAME)
+              name: task-pv-storage
+          ports:
+            - name: http
+              containerPort: 80
+          imagePullPolicy: IfNotPresent
       nodeSelector:
-        kubernetes.io/os: linux
+        kubernetes.io/os: linux

Solutions/EKS-logs-to-ELK/examples/example-app/templates/eks-sample-linux-deployment.yaml

@@ -1,8 +1,9 @@
+---
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   annotations:
-      trident.netapp.io/shareFromPVC: vector/shared-pv
+    trident.netapp.io/shareFromPVC: vector/shared-pv
   name: rpc-app-pvc
   namespace: rpc
 spec:

Solutions/EKS-logs-to-ELK/examples/example-app/templates/shared-pvc.yaml

@@ -1,12 +1,13 @@
+---
 fluentbit:
   enable: true
   input:
     tail:
       enable: true
       path: "/logs/*/*.log"
   output:
-      stdout: 
-        enable: true
+    stdout:
+      enable: true
 
   additionalVolumes: 
     - name: shared-logs