Merge pull request #151 from sysdiglabs/staging

Create LICENSE (#150)

Author: daviddetorres

.github/workflows/buildandDeploy.yml

@@ -6,7 +6,9 @@ name: buildandDeploy
 # events but only for the master branch
 on:
   push:
-    branches: [ staging ]
+    branches: 
+      - staging
+      - alerts
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -35,6 +37,18 @@ jobs:
     - name: Test with pytest
       run: |
         pytest
+
+    - name: Login to Artifactory
+      uses: docker/login-action@v1 
+      with:
+        registry: artifactory.internal.sysdig.com
+        username: [email protected]
+        password: ${{ secrets.ARTI_TOKEN }}
+
+    - name: Check rules
+      run: | 
+        ./tools/checkrules.sh
+
     - name: build and push docker image
       uses: docker/build-push-action@v1
       with:
@@ -43,11 +57,13 @@ jobs:
         registry: gcr.io
         repository: mateo-burillo-ns/promcat-resources
         tags: staging
+
     - name: Install dependencies for kubectl
       run: |
         curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl
         chmod +x ./kubectl
         sudo mv ./kubectl /usr/local/bin/kubectl
+
     - name: Deploy in staging
       env:
         GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}

LICENSE

@@ -33,6 +33,6 @@ You can contribute by:
 As the main objective of PromCat is to offer high quality resources for professional users, all contributions will be review and tested before merging to mainstream by the maintainers.
 
 # Attributions
-Most of the resources that you can find in PromCat are made and maintained by [Sysdig](http://sysdig.com). You can check [MAINTAINERS.md](MAINTAINERS.md) for more information.
+Most of the resources that you can find in PromCat are made and maintained by [Sysdig](http://sysdig.com) under GPL3 license. You can check [MAINTAINERS.md](MAINTAINERS.md) for more information.
 
 However, each of the Prometheus exporters and other open source resources that are used, are attributed and referenced in each application folder. If you find any attribution or reference that can be improved or edited, you can open an issue in the repository, make a pull request to this repository or contact us via the #promcat channel of the [Sysdig public slack](sysdig.slack.com).

README.md

@@ -10,6 +10,6 @@ availableVersions:
 shortDescription: "Solr is an open-source enterprise-search platform."
 description: |
   Solr is an open-source enterprise-search platform, written in Java, from the Apache Lucene project. 
-icon: https://upload.wikimedia.org/wikipedia/en/b/bb/Apache_Solr_Logo.svg
-website: https://lucene.apache.org/solr/
+icon: https://raw.githubusercontent.com/sysdiglabs/promcat-resources/master/apps/images/apachesolr.svg
+website: https://solr.apache.org/
 available: false

apps/apache-solr.yaml

@@ -10,6 +10,6 @@ availableVersions:
 shortDescription: "The Apache HTTP Server Project"
 description: |
   The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating systems including UNIX and Windows. The goal of this project is to provide a secure, efficient and extensible server that provides HTTP services in sync with the current HTTP standards.
-icon: https://upload.wikimedia.org/wikipedia/commons/d/db/Apache_HTTP_server_logo_%282016%29.svg
+icon: https://raw.githubusercontent.com/sysdiglabs/promcat-resources/master/apps/images/httpd.svg
 website: http://httpd.apache.org/
 available: true