Fix nginx and some files (#256)

Dlorite · jaimeyh · David Lorite Solanas · web-flow · commit 37968ad390b1 · 2023-05-04T10:44:49.000+02:00
* Add automatically resources (#250) * Add automatically resources * Add feedback and improvements * Add missing alerts * Update apps files * Add new changes and improvements * Update buildandDeploy.yml * Update buildandDeploy.yml * Add automatically resources (#251) * Add automatically resources * Add feedback and improvements * Add missing alerts * Update apps files * Add new changes and improvements * Fix some issues * Remove wrong files * Add dashboard yaml for opa * Add README for harbor * Remove readme to add later * Add README.md * Add missing README.md files and comment test for now * Change the github action * Change the github action * Add deploy in staging * Add new images * ADD fluentd and ntp dashboards images (#252) * Improve Readme files * Add links of the exporters as uri * Move coming soon to future apps * Add prerequisites for some ootb integrations * Update actions * [Issue #253] Fix missing } (#254) * Fix Python version in the action * Improve and fix files * Fix actions --------- Co-authored-by: Jaime Yera Hidalgo <106755265+jaimeyh@users.noreply.github.com> Co-authored-by: David Lorite Solanas <david.lorite@david.lorite>
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -11,7 +11,7 @@ on:
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
-  build:
+  productionBuild:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
diff --git a/.github/workflows/productionDeploy.yml b/.github/workflows/productionDeploy.yml
@@ -4,7 +4,7 @@ on:
 
 jobs:
   # This workflow contains a single job called "build"
-  build:
+  deployInProduction:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
@@ -29,8 +29,8 @@ jobs:
         cluster_name: ${{ secrets.CLUSTER_NAME }}
         location: 'us-central1-a'
         project_id: ${{ secrets.PROJECT_ID }}
-    
     - name: Deploy in production
       run: |
         chmod +x deployment/master/deploy.sh
         sh ./deployment/master/deploy.sh
+
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,25 +11,24 @@ on:
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
-  build:
+  test:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6]
+        python-version: [3.9]
 
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        apt-get update && apt-get install -y python-dev
         python -m pip install --upgrade pip
         pip install pytest pyyaml
     - name: Test with pytest
diff --git a/resources/apache/INSTALL.md b/resources/apache/INSTALL.md
@@ -78,7 +78,8 @@ To configure Apache server to produce common logs, include (or uncomment) the fo
        LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
        CustomLog /usr/local/apache2/logs/accesss.log common
 </IfModule>
-```# Installation
+```
+# Installation
 
 You can use our helm-charts in order to install the exporter in your cluster.
 ```sh
diff --git a/resources/ceph/INSTALL.md b/resources/ceph/INSTALL.md
@@ -7,6 +7,6 @@ Make sure that the Prometheus module is activated in the Ceph cluster by running
 
 ```
 ceph mgr module enable prometheus
-```# Installation
-
+```
+# Installation
 The application is ready to be scraped
diff --git a/resources/consul/INSTALL.md b/resources/consul/INSTALL.md
@@ -11,6 +11,7 @@ If you install Consul with Helm, you need to use the following flags:
 --set 'global.metrics.enableAgentMetrics=true'
 --set 'server.extraConfig="{"telemetry": {"disable_hostname": true}}"'
 --set 'client.extraConfig="{"telemetry": {"disable_hostname": true}}"'
-```# Installation
+```
+# Installation
 
 The application is ready to be scraped
diff --git a/resources/elasticsearch/INSTALL.md b/resources/elasticsearch/INSTALL.md
@@ -2,24 +2,17 @@
 
 ### Create the Secrets
 Keep in mind:
-* If your ElasticSearch cluster is using basic authentication, the secret that contains the url must have the user and password.
+* If your ElasticSearch cluster is using basic authentication, you have to create the secret that contains the user and password.
 * The secrets need to be created **in the same namespace where the exporter** will be deployed.
 * Use the **same _user name_ and _password_ that you used for the api**.
 * You can change the name of the secret. If you do this, you will need to **select it in the next steps** of the integration.
 
-#### Create the Secret for the URL
-##### Without Authentication
-```sh
-kubectl -n Your-Application-Namespace create secret generic elastic-url-secret \
-  --from-literal=url='http://SERVICE:PORT'
-```
+#### Create the Secret for the username and password with Basic Auth option
 
-##### With Basic Auth
 ```sh
-kubectl -n Your-Application-Namespace create secret generic elastic-url-secret \
-  --from-literal=url='https://USERNAME:PASSWORD@SERVICE:PORT'
+kubectl -n Your-Exporter-Namespace create secret generic elastic-user-pass-secret \
+  --from-literal=username='<your-username>' --from-literal=password='<your-password>'
 ```
-NOTE: You can use either http or https in the URL.
 
 #### Create the Secret for the TLS Certs
 If you are using HTTPS with custom certificates, follow the instructions given below.
diff --git a/resources/haproxy-ingress/INSTALL.md b/resources/haproxy-ingress/INSTALL.md
@@ -26,6 +26,7 @@ frontend prometheus
     http-request use-service lua.send-prometheus-root if { path / }
     http-request use-service lua.send-404
     no log
-```# Installation
+```
+# Installation
 
 The application is ready to be scraped
diff --git a/resources/harbor/INSTALL.md b/resources/harbor/INSTALL.md
@@ -7,6 +7,7 @@ As seen in the Harbor documentation page [Configure the Harbor YML File](https:/
 If you install Harbor with Helm, you need to use the following flag:
 ```
 --set 'metrics.enabled=true'
-```# Installation
+```
+# Installation
 
 The application is ready to be scraped
diff --git a/resources/kafka/INSTALL.md b/resources/kafka/INSTALL.md
@@ -36,7 +36,8 @@ kubectl create secret generic kafka-exporter-sasl-scram --from-file=username --f
 If using SASL+Kerberos, you'll need to create a Secret which contains the "kerberos.conf". If the 'Kerberos Auth Type' is 'keytabAuth', it should also contain the "kerberos.keytab". Example:
 ```
 kubectl create secret generic kafka-exporter-sasl-kerberos --from-file=./kerberos.conf --from-file=./kerberos.keytab --dry-run=true -o yaml | kubectl apply -f -
-```# Installation
+```
+# Installation
 
 You can use our helm-charts in order to install the exporter in your cluster.
 ```sh
diff --git a/resources/mongodb/INSTALL.md b/resources/mongodb/INSTALL.md
@@ -30,10 +30,10 @@ To configure authentication, do the following:
   mongodb://<YOUR-EXPORTER-USER>:<YOUR-EXPORTER-PASSWORD>@<YOUR-MONGODB-HOST>:<PORT>
 
   # TLS
-  mongodb://<YOUR-EXPORTER-USER>:<YOUR-EXPORTER-PASSWORD>@<YOUR-MONGODB-HOST>:<PORT>/admin?tls=true&amp;tlsCertificateKeyFile=/etc/mongodb/mongodb-exporter-key.pem&amp;tlsAllowInvalidCertificates=true&amp;tlsCAFile=/etc/mongodb/mongodb-exporter-ca.pem
+  mongodb://<YOUR-EXPORTER-USER>:<YOUR-EXPORTER-PASSWORD>@<YOUR-MONGODB-HOST>:<PORT>/admin?tls=true&tlsCertificateKeyFile=/etc/mongodb/mongodb-exporter-key.pem&tlsAllowInvalidCertificates=true&tlsCAFile=/etc/mongodb/mongodb-exporter-ca.pem
 
   # SSL
-  mongodb://<YOUR-EXPORTER-USER>:<YOUR-EXPORTER-PASSWORD>@<YOUR-MONGODB-HOST>:<PORT>/admin?ssl=true&amp;sslclientcertificatekeyfile=/etc/mongodb/mongodb-exporter-key.pem&amp;sslinsecure=true&amp;sslcertificateauthorityfile=/etc/mongodb/mongodb-exporter-ca.pem
+  mongodb://<YOUR-EXPORTER-USER>:<YOUR-EXPORTER-PASSWORD>@<YOUR-MONGODB-HOST>:<PORT>/admin?ssl=true&sslclientcertificatekeyfile=/etc/mongodb/mongodb-exporter-key.pem&sslinsecure=true&sslcertificateauthorityfile=/etc/mongodb/mongodb-exporter-ca.pem
   ```
 2. Create the secret for the connection string:
   ```
@@ -45,7 +45,8 @@ To configure authentication, do the following:
   kubectl create secret -n Your-Exporter-Namespace generic mongodb-exporter-auth \
     --from-file=mongodb-key=<route-to-your-private-key.pem> \
     --from-file=mongodb-ca=<route-to-your-ca.pem>
-  ```# Installation
+  ```
+# Installation
 
 You can use our helm-charts in order to install the exporter in your cluster.
 ```sh
diff --git a/resources/mssql/include/alerts/alerts.yaml b/resources/mssql/include/alerts/alerts.yaml
@@ -1,5 +1,5 @@
 groups:
-    - name: MongoDB
+    - name: MSSQL
       rules:
         - alert: '[MSSQL] SqlServerDeadlock'
           expr: |
diff --git a/resources/mysql/INSTALL.md b/resources/mysql/INSTALL.md
@@ -44,7 +44,8 @@ host=YOUR-DB-IP
 ssl-ca=/lib/cert/ca.pem
 ssl-key=/lib/cert/client-key.pem
 ssl-cert=/lib/cert/client-cert.pem
-```# Installation
+```
+# Installation
 
 You can use our helm-charts in order to install the exporter in your cluster.
 ```sh
diff --git a/resources/nginx-ingress/INSTALL.md b/resources/nginx-ingress/INSTALL.md
@@ -18,8 +18,6 @@ Another option is adding the following line to the NGINX Ingress configuration f
 ```
 controller.metrics.podAnnotations.prometheus.io/scrape=true
 ```
-
-
 # Installation
 
 The application is ready to be scraped
diff --git a/resources/nginx/INSTALL.md b/resources/nginx/INSTALL.md
@@ -35,7 +35,8 @@ data:
         allow all;  # REPLACE with your access policy
       }
     }
-```# Installation
+```
+# Installation
 
 You can use our helm-charts in order to install the exporter in your cluster.
 ```sh
diff --git a/resources/nginx/README.md b/resources/nginx/README.md
@@ -6,10 +6,10 @@ Versions supported: > v12
 # Type
 This integration uses a sidecar exporter that is available in UBI or scratch base image.
 The integration is using the following exporters:
-- mysql-exporter: [https://quay.io/repository/sysdig/mysql-exporter](https://quay.io/repository/sysdig/mysql-exporter)
+- nginx-exporter: [https://quay.io/repository/sysdig/nginx-exporter](https://quay.io/repository/sysdig/nginx-exporter)
 
 
 # Attributions
 The configuration files and dashboards maintained by [Sysdig team](https://sysdig.com/).
 # License
-- mysql-exporter with Apache license.
+- nginx-exporter with Apache license.
diff --git a/resources/php-fpm/INSTALL.md b/resources/php-fpm/INSTALL.md
@@ -57,7 +57,8 @@ spec:
             defaultMode: 420
             name: php-fpm-config
           name: php-fpm-config
-```# Installation
+```
+# Installation
 
 You can use our helm-charts in order to install the exporter in your cluster.
 ```sh
diff --git a/resources/postgresql/INSTALL.md b/resources/postgresql/INSTALL.md
@@ -79,7 +79,6 @@ kubectl create -n Your-Application-Namespace secret generic postgresql-exporter
   --from-file=sslRootCert=/path/to/tls/cert
 ```
 # Installation
-
 You can use our helm-charts in order to install the exporter in your cluster.
 ```sh
 helm install --repo https://sysdiglabs.github.io/integrations-charts postgresql-exporter postgresql-exporter
diff --git a/resources/redis/INSTALL.md b/resources/redis/INSTALL.md
@@ -19,8 +19,8 @@ kubectl create secret -n Your-Application-Namespace generic redis-exporter-auth
   --from-literal=user=USER \
   --from-literal=password=PASSWORD
 ```
-Replace `USER` and `PASSWORD` with yours for the Redis instance.# Installation
-
+Replace `USER` and `PASSWORD` with yours for the Redis instance.
+# Installation
 You can use our helm-charts in order to install the exporter in your cluster.
 ```sh
 helm install --repo https://sysdiglabs.github.io/integrations-charts redis-exporter redis-exporter
