resolved conflicts

Signed-off-by: shubham chaudhary <[email protected]>

.github/CODEOWNERS

@@ -0,0 +1,5 @@
+# Lines starting with '#' are comments.
+# Each line is a file pattern followed by one or more owners.
+
+# These owners will be the default owners for everything in the repo.
+*           @ispeakc0de @ksatchit @rajdas98 @uditgaurav

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,27 @@
+<!-- This form is for bug reports and feature requests ONLY! -->
+<!-- Thanks for filing an issue! Before hitting the button, please answer these questions.-->
+
+## Is this a BUG REPORT or FEATURE REQUEST?
+
+ Choose one: BUG REPORT or FEATURE REQUEST
+
+<!--
+If this is a BUG REPORT, please:
+  - Fill in as much of the template below as you can.  If you leave out information, we can't help you as well.
+
+If this is a FEATURE REQUEST, please:
+  - Describe *in detail* the feature/behavior/change you'd like to see.
+
+In both cases, be ready for followup questions, and please respond in a timely
+manner.  If we can't reproduce a bug or think a feature already exists, we
+might close your issue.  If we're wrong, PLEASE feel free to reopen it and
+explain why.
+-->
+
+**What happened**:
+
+**What you expected to happen**:
+
+**How to reproduce it (as minimally and precisely as possible)**:
+
+**Anything else we need to know?**:

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+<!--  Thanks for sending a pull request!  Here are some tips for you -->
+
+**What this PR does / why we need it**:
+
+**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #
+
+**Special notes for your reviewer**:
+
+**Checklist:**
+-   [ ] Fixes #<issue number>
+-   [ ] Labelled this PR & related issue with `documentation` tag
+-   [ ] PR messages has document related information
+-   [ ] Labelled this PR & related issue with `breaking-changes` tag
+-   [ ] PR messages has breaking changes related information
+-   [ ] Labelled this PR & related issue with `requires-upgrade` tag
+-   [ ] PR messages has upgrade related information
+-   [ ] Commit has unit tests
+-   [ ] Commit has integration tests

.github/auto-merge.yml

@@ -0,0 +1,24 @@
+# Configuration for probot-auto-merge - https://github.com/bobvanderlinden/probot-auto-merge
+
+reportStatus: true
+updateBranch: false
+deleteBranchAfterMerge: true
+mergeMethod: squash
+
+minApprovals:
+  COLLABORATOR: 0
+maxRequestedChanges:
+  NONE: 0
+blockingLabels:
+- DO NOT MERGE
+- WIP
+- blocked
+
+# Will merge whenever the above conditions are met, but also
+# the owner has approved or merge label was added.
+rules:
+- minApprovals:
+    OWNER: 1
+- requiredLabels:
+  - merge
+

.github/workflows/build.yml

@@ -34,6 +34,17 @@ jobs:
         run: |
           make unused-package-check
 
+  security:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Run Snyk to check for vulnerabilities
+        uses: snyk/actions/golang@master
+        env:
+          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+        with:
+          args: --severity-threshold=high     
+
   trivy:
     needs: pre-checks
     runs-on: ubuntu-latest

.github/workflows/push.yml

@@ -102,17 +102,3 @@ jobs:
       - name: Running Go BDD Test
         run: |
           make test
-
-  security-scan:
-    needs: pre-checks
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'docker.io/litmuschaos/chaos-exporter:ci'
-          format: 'table'
-          exit-code: '0'
-          ignore-unfixed: true
-          vuln-type: 'os,library'
-          severity: 'CRITICAL,HIGH'

.github/workflows/release.yml

@@ -116,17 +116,3 @@ jobs:
       - name: Running Go BDD Test
         run: |
           make test
-
-  security-scan:
-    needs: pre-checks
-    runs-on: ubuntu-latest
-    steps:
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: 'docker.io/litmuschaos/chaos-exporter:ci'
-          format: 'table'
-          exit-code: '0'
-          ignore-unfixed: true
-          vuln-type: 'os,library'
-          severity: 'CRITICAL,HIGH'

contributing.md → CONTRIBUTING.md

@@ -57,6 +57,5 @@ For setting up a Development environment on your local host, see the detailed in
 
 ## Community
 
-The litmus community will have a weekly contributor sync-up on Tuesdays 16.00-16.30IST / 12.30-13.00CEST
-  - The sync up meeting is held online on [Google Hangouts](https://meet.google.com/uvt-ozaw-bvp)
-  - The release items are tracked in this [planning sheet](https://docs.google.com/spreadsheets/d/15svGB99bDcSTkwAYttH1QzP5WJSb-dFKbPzl-9WqmXM). 
+The litmus community will have a monthly community sync-up on 3rd Wednesday 22.00-23.00IST / 18.30-19.30CEST
+-  The community meeting details are available [here](https://hackmd.io/a4Zu_sH4TZGeih-xCimi3Q). Please feel free to join the community meeting.