diff --git a/.vib/prometheus/cypress/cypress.env.json b/.vib/prometheus/cypress/cypress.env.json index c79753f916..de55fd868e 100644 --- a/.vib/prometheus/cypress/cypress.env.json +++ b/.vib/prometheus/cypress/cypress.env.json @@ -1,4 +1,5 @@ { + "scrapeInterval": 10000, "deployments": { "alertmanager": { "query": "alertmanager_alerts" diff --git a/.vib/prometheus/cypress/cypress.json b/.vib/prometheus/cypress/cypress.json index 7f8fff3de7..a1ed6a334b 100644 --- a/.vib/prometheus/cypress/cypress.json +++ b/.vib/prometheus/cypress/cypress.json @@ -1,4 +1,4 @@ { - "baseUrl": "http://localhost:8080", + "baseUrl": "http://localhost", "defaultCommandTimeout": 30000 } diff --git a/.vib/prometheus/cypress/cypress/integration/prometheus_spec.js b/.vib/prometheus/cypress/cypress/integration/prometheus_spec.js index f1fc4637f4..f4624f2657 100644 --- a/.vib/prometheus/cypress/cypress/integration/prometheus_spec.js +++ b/.vib/prometheus/cypress/cypress/integration/prometheus_spec.js @@ -2,11 +2,11 @@ it('allows executing a query and displaying response data for each deployment', () => { const deployments = Cypress.env('deployments'); - + // Wait 2 times the scrape interval + cy.wait(2 * Cypress.env('scrapeInterval')); cy.visit(`/graph`); Object.keys(deployments).forEach((podName, i) => { const query = Object.values(deployments)[i].query; - cy.get('[role="textbox"]').clear({force: true}).type(`${query}{enter}`,{delay: 100}); cy.contains('Execute').click(); cy.contains('.data-table', `container="${podName}"`) @@ -18,7 +18,6 @@ it('checks targets status', () => { Object.keys(targets).forEach((podName, i) => { const podData = Object.values(targets)[i]; - cy.visit(`/targets?search=${podName}`); cy.contains(`${podData.replicaCount}/${podData.replicaCount} up`); }) diff --git a/.vib/prometheus/runtime-parameters.yaml b/.vib/prometheus/runtime-parameters.yaml index 2aeafbbe3a..78c2275f90 100644 --- a/.vib/prometheus/runtime-parameters.yaml +++ b/.vib/prometheus/runtime-parameters.yaml @@ -30,6 +30,7 @@ server: containerPorts: http: 8080 existingConfigmapKey: test.yaml + scrapeInterval: 10s extraScrapeConfigs: - job_name: wordpress kubernetes_sd_configs: diff --git a/bitnami/prometheus/Chart.yaml b/bitnami/prometheus/Chart.yaml index 4809962791..b96dc763b5 100644 --- a/bitnami/prometheus/Chart.yaml +++ b/bitnami/prometheus/Chart.yaml @@ -23,4 +23,4 @@ sources: - https://github.com/bitnami/containers/tree/main/bitnami/prometheus - https://github.com/prometheus/prometheus - https://github.com/prometheus-community/helm-charts -version: 0.1.2 +version: 0.1.3 diff --git a/bitnami/prometheus/values.yaml b/bitnami/prometheus/values.yaml index df9ac1f82f..16498c229f 100644 --- a/bitnami/prometheus/values.yaml +++ b/bitnami/prometheus/values.yaml @@ -81,7 +81,7 @@ alertmanager: image: registry: docker.io repository: bitnami/alertmanager - tag: 0.25.0-debian-11-r50 + tag: 0.25.0-debian-11-r51 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -577,7 +577,7 @@ server: image: registry: docker.io repository: bitnami/prometheus - tag: 2.44.0-debian-11-r3 + tag: 2.44.0-debian-11-r4 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -1479,7 +1479,7 @@ volumePermissions: image: registry: docker.io repository: bitnami/bitnami-shell - tag: 11-debian-11-r118 + tag: 11-debian-11-r119 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace.