Bump version

CHANGELOG.md

@@ -250,9 +250,9 @@
 * [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.39.0)
 * experimental TSDB: Add support for ingesting out-of-order samples. This is configured via out_of_order_time_window field in the config file; check config file docs for more info. #11075
 * API: /-/healthy and /-/ready API calls now also respond to a HEAD request on top of existing GET support. #11160
-* PuppetDB SD: Add __meta_puppetdb_query label. #11238
-* AWS EC2 SD: Add __meta_ec2_region label. #11326
-* AWS Lightsail SD: Add __meta_lightsail_region label. #11326
+* PuppetDB SD: Add `__meta_puppetdb_query` label. #11238
+* AWS EC2 SD: Add `__meta_ec2_region label`. #11326
+* AWS Lightsail SD: Add `__meta_lightsail_region` label. #11326
 * Scrape: Optimise relabeling by re-using memory. #11147
 * TSDB: Improve WAL replay timings. #10973 #11307 #11319
 * TSDB: Optimise memory by not storing unnecessary data in the memory. #11280 #11288 #11296
@@ -281,3 +281,262 @@
 * [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.40.3)
 * TSDB: Fix compaction after a deletion is called. #11623
 
+[1.18.4]
+* Update Prometheus to 2.40.4
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.40.4)
+* Fix Basic Authentication Bypass (CVE-2022-46146)
+
+[1.18.5]
+* Update Prometheus to 2.40.5
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.40.5)
+* [BUGFIX] TSDB: Fix queries involving native histograms due to improper reset of iterators. #11643
+
+[1.18.6]
+* Update Prometheus to 2.40.6
+* Update Coudron base image to 4.0.0
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.40.6)
+
+[1.18.7]
+* Update Prometheus to 2.40.7
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.40.7)
+* [BUGFIX] TSDB: Fix queries involving negative buckets of native histograms. #11699
+
+[1.19.0]
+* Update Prometheus to 2.41.0
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.41.0)
+
+[1.20.0]
+* Update Prometheus to 2.42.0
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.42.0)
+
+[1.21.0]
+* Update Prometheus to 2.43.0
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.43.0)
+
+[1.21.1]
+* Update Prometheus to 2.43.1
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.43.1)
+
+[1.22.0]
+* Update Prometheus to 2.44.0
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.44.0)
+* [CHANGE] Remote-write: Raise default samples per send to 2,000. #12203
+* [FEATURE] Remote-read: Handle native histograms. #12085, #12192
+* [FEATURE] Promtool: Health and readiness check of prometheus server in CLI. #12096
+* [FEATURE] PromQL: Add query_samples_total metric, the total number of samples loaded by all queries. #12251
+* [ENHANCEMENT] Storage: Optimise buffer used to iterate through samples. #12326
+* [ENHANCEMENT] Scrape: Reduce memory allocations on target labels. #12084
+* [ENHANCEMENT] PromQL: Use faster heap method for topk() / bottomk(). #12190
+* [ENHANCEMENT] Rules API: Allow filtering by rule name. #12270
+* [ENHANCEMENT] Native Histograms: Various fixes and improvements. #11687, #12264, #12272
+* [ENHANCEMENT] UI: Search of scraping pools is now case-insensitive. #12207
+
+[1.23.0]
+* Update Prometheus to 2.45.0
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.45.0)
+* [FEATURE] API: New limit parameter to limit the number of items returned by /api/v1/status/tsdb endpoint. #12336
+* [FEATURE] Config: Add limits to global config. #12126
+* [FEATURE] Consul SD: Added support for path_prefix. #12372
+* [FEATURE] Native histograms: Add option to scrape both classic and native histograms. #12350
+* [FEATURE] Native histograms: Added support for two more arithmetic operators avg_over_time and sum_over_time. #12262
+* [FEATURE] Promtool: When providing the block id, only one block will be loaded and analyzed. #12031
+* [FEATURE] Remote-write: New Azure ad configuration to support remote writing directly to Azure Monitor workspace. #11944
+* [FEATURE] TSDB: Samples per chunk are now configurable with flag storage.tsdb.samples-per-chunk. By default set to its former value 120. #12055
+* [ENHANCEMENT] Native histograms: bucket size can now be limited to avoid scrape fails. #12254
+* [ENHANCEMENT] TSDB: Dropped series are now deleted from the WAL sooner. #12297
+* [BUGFIX] Native histograms: ChunkSeries iterator now checks if a new sample can be appended to the open chunk. #12185
+* [BUGFIX] Native histograms: Fix Histogram Appender Appendable() segfault. #12357
+* [BUGFIX] Native histograms: Fix setting reset header to gauge histograms in seriesToChunkEncoder. #12329
+* [BUGFIX] TSDB: Tombstone intervals are not modified after Get() call. #12245
+* [BUGFIX] TSDB: Use path/filepath to set the WAL directory. #12349
+
+[1.24.0]
+* Move storage directory to `/app/data/storage`
+* CLI options can now be set in `/app/data/env.sh`
+
+[1.25.0]
+* Update Prometheus to 2.46.0
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.46.0)
+* [FEATURE] Promtool: Add PromQL format and label matcher set/delete commands to promtool. #11411
+* [FEATURE] Promtool: Add push metrics command. #12299
+* [ENHANCEMENT] Promtool: Read from stdin if no filenames are provided in check rules. #12225
+* [ENHANCEMENT] Hetzner SD: Support larger ID's that will be used by Hetzner in September. #12569
+* [ENHANCEMENT] Kubernetes SD: Add more labels for endpointslice and endpoints role. #10914
+* [ENHANCEMENT] Kubernetes SD: Do not add pods to target group if the PodIP status is not set. #11642
+* [ENHANCEMENT] OpenStack SD: Include instance image ID in labels. #12502
+* [ENHANCEMENT] Remote Write receiver: Validate the metric names and labels. #11688
+* [ENHANCEMENT] Web: Initialize prometheus_http_requests_total metrics with code label set to 200. #12472
+* [ENHANCEMENT] TSDB: Add Zstandard compression option for wlog. #11666
+* [ENHANCEMENT] TSDB: Support native histograms in snapshot on shutdown. #12258
+* [ENHANCEMENT] Labels: Avoid compiling regexes that are literal. #12434
+* [BUGFIX] Histograms: Fix parsing of float histograms without zero bucket. #12577
+* [BUGFIX] Histograms: Fix scraping native and classic histograms missing some histograms. #12554
+* [BUGFIX] Histograms: Enable ingestion of multiple exemplars per sample. 12557
+* [BUGFIX] File SD: Fix path handling in File-SD watcher to allow directory monitoring on Windows. #12488
+* [BUGFIX] Linode SD: Cast InstanceSpec values to int64 to avoid overflows on 386 architecture. #12568
+* [BUGFIX] PromQL Engine: Include query parsing in active-query tracking. #12418
+* [BUGFIX] TSDB: Handle TOC parsing failures. #10623
+
+[1.26.0]
+* Update Prometheus to 2.47.0
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.47.0)
+* [FEATURE] Web: Add OpenTelemetry (OTLP) Ingestion endpoint. #12571 #12643
+* [FEATURE] Scraping: Optionally limit detail on dropped targets, to save memory. #12647
+* [ENHANCEMENT] TSDB: Write head chunks to disk in the background to reduce blocking. #11818
+* [ENHANCEMENT] PromQL: Speed up aggregate and function queries. #12682
+* [ENHANCEMENT] PromQL: More efficient evaluation of query with timestamp(). #12579
+* [ENHANCEMENT] API: Faster streaming of Labels to JSON. #12598
+* [ENHANCEMENT] Agent: Memory pooling optimisation. #12651
+* [ENHANCEMENT] TSDB: Prevent storage space leaks due to terminated snapshots on shutdown. #12664
+* [ENHANCEMENT] Histograms: Refactoring and optimisations. #12352 #12584 #12596 #12711 #12054
+* [ENHANCEMENT] Histograms: Add histogram_stdvar and histogram_stddev functions. #12614
+* [ENHANCEMENT] Remote-write: add http.resend_count tracing attribute. #12676
+
+[1.26.1]
+* Update Prometheus to 2.47.1
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.47.1)
+* [BUGFIX] Fix duplicate sample detection at chunk size limit #12874
+
+[1.26.2]
+* Update Prometheus to 2.47.2
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.47.2)
+
+[1.27.0]
+* Update Prometheus to 2.48.0
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.48.0)
+* [CHANGE] Remote-write: respect Retry-After header on 5xx errors. #12677
+* [FEATURE] Alerting: Add AWS SigV4 authentication support for Alertmanager endpoints. #12774
+* [FEATURE] Promtool: Add support for histograms in the TSDB dump command. #12775
+* [FEATURE] PromQL: Add warnings (and annotations) to PromQL query results. #12152 #12982 #12988 #13012
+* [FEATURE] Remote-write: Add Azure AD OAuth authentication support for remote write requests. #12572
+* [ENHANCEMENT] Remote-write: Add a header to count retried remote write requests. #12729
+* [ENHANCEMENT] TSDB: Improve query performance by re-using iterator when moving between series. #12757
+* [ENHANCEMENT] UI: Move /targets page discovered labels to expandable section #12824
+* [ENHANCEMENT] TSDB: Optimize WBL loading by not sending empty buffers over channel. #12808
+* [ENHANCEMENT] TSDB: Reply WBL mmap markers concurrently. #12801
+* [ENHANCEMENT] Promtool: Add support for specifying series matchers in the TSDB analyze command. #12842
+* [ENHANCEMENT] PromQL: Prevent Prometheus from overallocating memory on subquery with large amount of steps. #12734
+* [ENHANCEMENT] PromQL: Add warning when monotonicity is forced in the input to histogram_quantile. #12931
+* [ENHANCEMENT] Scraping: Optimize sample appending by reducing garbage. #12939
+* [ENHANCEMENT] Storage: Reduce memory allocations in queries that merge series sets. #12938
+* [ENHANCEMENT] UI: Show group interval in rules display. #12943
+* [ENHANCEMENT] Scraping: Save memory when scraping by delaying creation of buffer. #12953
+* [ENHANCEMENT] Agent: Allow ingestion of out-of-order samples. #12897
+* [ENHANCEMENT] Promtool: Improve support for native histograms in TSDB analyze command. #12869
+* [ENHANCEMENT] Scraping: Add configuration option for tracking staleness of scraped timestamps. #13060
+* [BUGFIX] SD: Ensure that discovery managers are properly canceled. #10569
+* [BUGFIX] TSDB: Fix PostingsForMatchers race with creating new series. #12558
+* [BUGFIX] TSDB: Fix handling of explicit counter reset header in histograms. #12772
+* [BUGFIX] SD: Validate HTTP client configuration in HTTP, EC2, Azure, Uyuni, PuppetDB, and Lightsail SDs. #12762 #12811 #12812 #12815 #12814 #12816
+* [BUGFIX] TSDB: Fix counter reset edgecases causing native histogram panics. #12838
+* [BUGFIX] TSDB: Fix duplicate sample detection at chunk size limit. #12874
+* [BUGFIX] Promtool: Fix errors not being reported in check rules command. #12715
+* [BUGFIX] TSDB: Avoid panics reported in logs when head initialization takes a long time. #12876
+* [BUGFIX] TSDB: Ensure that WBL is repaired when possible. #12406
+* [BUGFIX] Storage: Fix crash caused by incorrect mixed samples handling. #13055
+* [BUGFIX] TSDB: Fix compactor failures by adding min time to histogram chunks. #13062
+
+[1.27.1]
+* Update Prometheus to 2.48.1
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.48.1)
+* [BUGFIX] TSDB: Make the wlog watcher read segments synchronously when not tailing. #13224
+* [BUGFIX] Agent: Participate in notify calls (fixes slow down in remote write handling introduced in 2.45). #13223
+
+[1.28.0]
+* Update Prometheus to 2.49.0
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.49.0)
+* [FEATURE] Promtool: Add --run flag promtool test rules command. #12206
+* [FEATURE] SD: Add support for NS records to DNS SD. #13219
+* [FEATURE] UI: Add heatmap visualization setting in the Graph tab, useful histograms. #13096 #13371
+* [FEATURE] Scraping: Add `scrape_config.enable_compression` (default true) to disable gzip compression when scraping the target. #13166
+* [FEATURE] PromQL: Add a promql-experimental-functions feature flag containing some new experimental PromQL functions. #13103 NOTE: More experimental functions might be added behind the same feature flag in the future. Added functions:
+* [FEATURE] SD: Add `__meta_linode_gpus` label to Linode SD. #13097
+* [FEATURE] API: Add `exclude_alerts` query parameter to /api/v1/rules to only return recording rules. #12999
+* [FEATURE] TSDB: --storage.tsdb.retention.time flag value is now exposed as a `prometheus_tsdb_retention_limit_seconds` metric. #12986
+* [FEATURE] Scraping: Add ability to specify priority of scrape protocols to accept during scrape (e.g. to scrape Prometheus proto format for certain jobs). This can be changed by setting `global.scrape_protocols` and `scrape_config.scrape_protocols`. #12738
+
+[1.28.1]
+* Update Prometheus to 2.49.1
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.49.1)
+* [BUGFIX] TSDB: Fixed a wrong q= value in scrape accept header #13313
+
+[1.29.0]
+* Update Prometheus to 2.50.0
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.50.0)
+* [CHANGE] Remote Write: Error storage.ErrTooOldSample is now generating HTTP error 400 instead of HTTP error 500. #13335
+* [FEATURE] Remote Write: Drop old inmemory samples. Activated using the config entry sample_age_limit. #13002
+* [FEATURE] Experimental: Add support for ingesting zeros as created timestamps. (enabled under the feature-flag created-timestamp-zero-ingestion). #12733 #13279
+* [FEATURE] Promtool: Add analyze histograms command. #12331
+* [FEATURE] TSDB/compaction: Add a way to enable overlapping compaction. #13282 #13393 #13398
+* [FEATURE] Add automatic memory limit handling. Activated using the feature flag. auto-gomemlimit #13395
+* [ENHANCEMENT] Promtool: allow specifying multiple matchers in promtool tsdb dump. #13296
+* [ENHANCEMENT] PromQL: Restore more efficient version of NewPossibleNonCounterInfo annotation. #13022
+* [ENHANCEMENT] Kuma SD: Extend configuration to allow users to specify client ID. #13278
+* [ENHANCEMENT] PromQL: Use natural sort in sort_by_label and sort_by_label_desc. This is experimental. #13411
+* [ENHANCEMENT] Native Histograms: support native_histogram_min_bucket_factor in scrape_config. #13222
+* [ENHANCEMENT] Native Histograms: Issue warning if histogramRate is applied to the wrong kind of histogram. #13392
+* [ENHANCEMENT] TSDB: Make transaction isolation data structures smaller. #13015
+* [ENHANCEMENT] TSDB/postings: Optimize merge using Loser Tree. #12878
+* [ENHANCEMENT] TSDB: Simplify internal series delete function. #13261
+* [ENHANCEMENT] Agent: Performance improvement by making the global hash lookup table smaller. #13262
+* [ENHANCEMENT] PromQL: faster execution of metric functions, e.g. abs(), rate() #13446
+* [ENHANCEMENT] TSDB: Optimize label values with matchers by taking shortcuts. #13426
+* [ENHANCEMENT] Kubernetes SD: Check preconditions earlier and avoid unnecessary checks or iterations in kube_sd. #13408
+* [ENHANCEMENT] Promtool: Improve visibility for promtool test rules with JSON colored formatting. #13342
+* [ENHANCEMENT] Consoles: Exclude iowait and steal from CPU Utilisation. #9593
+* [ENHANCEMENT] Various improvements and optimizations on Native Histograms. #13267, #13215, #13276 #13289, #13340
+* [BUGFIX] Scraping: Fix quality value in HTTP Accept header. #13313
+* [BUGFIX] UI: Fix usage of the function time() that was crashing. #13371
+* [BUGFIX] Azure SD: Fix SD crashing when it finds a VM scale set. #13578
+
+[1.29.1]
+* Update Prometheus to 2.50.1
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.50.1)
+* [BUGFIX] API: Fix metadata API using wrong field names. #13633
+
+[1.30.0]
+* Update Prometheus to 2.51.0
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.51.0)
+
+[1.30.1]
+* Update Prometheus to 2.51.1
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.51.1)
+* [BUGFIX] PromQL: Re-instate validation of `label_join` destination label #13803
+* [BUGFIX] Scraping (experimental native histograms): Fix handling of the min bucket factor on sync of targets #13846
+* [BUGFIX] PromQL: Some queries could return the same series twice (library use only) #13845
+
+[1.30.2]
+* Update Prometheus to 2.51.2
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.51.2)
+* Notifier: could hang when using relabeling on alerts
+
+[1.31.0]
+* Update Prometheus to 2.52.0
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.52.0)
+* [CHANGE] TSDB: Fix the predicate checking for blocks which are beyond the retention period to include the ones right at the retention boundary. #9633
+* [FEATURE] Kubernetes SD: Add a new metric prometheus_sd_kubernetes_failures_total to track failed requests to Kubernetes API. #13554
+* [FEATURE] Kubernetes SD: Add node and zone metadata labels when using the endpointslice role. #13935
+* [FEATURE] Azure SD/Remote Write: Allow usage of Azure authorization SDK. #13099
+* [FEATURE] Alerting: Support native histogram templating. #13731
+* [FEATURE] Linode SD: Support IPv6 range discovery and region filtering. #13774
+* [ENHANCEMENT] PromQL: Performance improvements for queries with regex matchers. #13461
+* [ENHANCEMENT] PromQL: Performance improvements when using aggregation operators. #13744
+* [ENHANCEMENT] PromQL: Validate label_join destination label. #13803
+* [ENHANCEMENT] Scrape: Increment prometheus_target_scrapes_sample_duplicate_timestamp_total metric on duplicated series during one scrape. #12933
+* [ENHANCEMENT] TSDB: Many improvements in performance. #13742 #13673 #13782
+* [ENHANCEMENT] TSDB: Pause regular block compactions if the head needs to be compacted (prioritize head as it increases memory consumption). #13754
+* [ENHANCEMENT] Observability: Improved logging during signal handling termination. #13772
+* [ENHANCEMENT] Observability: All log lines for drop series use "num_dropped" key consistently. #13823
+* [ENHANCEMENT] Observability: Log chunk snapshot and mmaped chunk replay duration during WAL replay. #13838
+* [ENHANCEMENT] Observability: Log if the block is being created from WBL during compaction. #13846
+* [BUGFIX] PromQL: Fix inaccurate sample number statistic when querying histograms. #13667
+* [BUGFIX] PromQL: Fix histogram_stddev and histogram_stdvar for cases where the histogram has negative buckets. #13852
+* [BUGFIX] PromQL: Fix possible duplicated label name and values in a metric result for specific queries. #13845
+* [BUGFIX] Scrape: Fix setting native histogram schema factor during scrape. #13846
+* [BUGFIX] TSDB: Fix counting of histogram samples when creating WAL checkpoint stats. #13776
+* [BUGFIX] TSDB: Fix cases of compacting empty heads. #13755
+* [BUGFIX] TSDB: Count float histograms in WAL checkpoint. #13844
+* [BUGFIX] Remote Read: Fix memory leak due to broken requests. #13777
+* [BUGFIX] API: Stop building response for /api/v1/series/ when the API request was cancelled. #13766
+* [BUGFIX] promtool: Fix panic on promtool tsdb analyze --extended when no native histograms are present. #13976
+

CloudronManifest.json

@@ -1,9 +1,9 @@
 {
-  "version": "1.18.3",
-  "upstreamVersion": "2.40.3",
+  "version": "1.31.0",
+  "upstreamVersion": "2.52.0",
   "id": "io.prometheus.cloudronapp",
   "title": "Prometheus Server",
-  "author": "Erik Tadevosyan",
+  "author": "Prometheus Developers",
   "description": "file://DESCRIPTION.md",
   "tagline": "From metrics to insight",
   "healthCheckPath": "/",

Dockerfile

@@ -1,12 +1,12 @@
-FROM cloudron/base:3.2.0@sha256:ba1d566164a67c266782545ea9809dc611c4152e27686fd14060332dd88263ea
+FROM cloudron/base:4.2.0@sha256:46da2fffb36353ef714f97ae8e962bd2c212ca091108d768ba473078319a47f4
 
 RUN mkdir -p /app/code /app/pkg
 WORKDIR /app/code
 
-ARG VERSION=2.40.3
+ARG VERSION=2.52.0
 
 RUN curl -L https://github.com/prometheus/prometheus/releases/download/v${VERSION}/prometheus-${VERSION}.linux-amd64.tar.gz | tar zxvf - --strip-components 1
 
-COPY default_prometheus_variables.sh start.sh /app/pkg/
+COPY env.sh.template start.sh /app/pkg/
 
 CMD [ "/app/pkg/start.sh" ]

default_prometheus_variables.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-# https://prometheus.io/docs/prometheus/latest/storage/#operational-aspects
-export retention_time="15d"

env.sh.template

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# https://prometheus.io/docs/prometheus/latest/storage/#operational-aspects
+# edit this variable to change startup options
+export cli_options="--storage.tsdb.retention.time=15d --storage.tsdb.path=/app/data/storage"

start.sh

@@ -2,7 +2,7 @@
 
 set -eu
 
-mkdir -p /app/data/runtime /app/data/config
+mkdir -p /app/data/storage /app/data/config
 
 if [[ ! -f /app/data/config/prometheus.yml ]]; then
     echo "=> Creating config file on first run"
@@ -11,13 +11,13 @@ fi
 
 chown -R cloudron:cloudron /app/data
 
-if [[ ! -f /app/data/prometheus_variables.sh ]]; then
-    echo "=> Copy default prometheus variable file since it does not exist"
-    cp /app/pkg/default_prometheus_variables.sh /app/data/prometheus_variables.sh
+if [[ ! -f /app/data/env.sh ]]; then
+    echo "=> Copy default env.sh"
+    cp /app/pkg/env.sh.template /app/data/env.sh
 fi
 
-echo "=> Source custom variables"
-source /app/data/prometheus_variables.sh
+echo "=> Source custom variables for cli args"
+source /app/data/env.sh
 
-echo "=> Starting Prometheus with retention time of $retention_time"
-exec /usr/local/bin/gosu cloudron:cloudron /app/code/prometheus --config.file=/app/data/config/prometheus.yml --storage.tsdb.path=/app/data/runtime --storage.tsdb.retention.time="${retention_time:-15d}"
+echo "=> Starting Prometheus"
+exec /usr/local/bin/gosu cloudron:cloudron /app/code/prometheus --config.file=/app/data/config/prometheus.yml ${cli_options}

test/package.json

@@ -10,12 +10,10 @@
   "license": "ISC",
   "devDependencies": {
     "expect.js": "^0.3.1",
-    "mocha": "^10.1.0",
-    "selenium-server-standalone-jar": "^3.141.59",
-    "selenium-webdriver": "^4.6.1",
-    "superagent": "^8.0.3"
+    "mocha": "^10.4.0",
+    "selenium-webdriver": "^4.20.0"
   },
   "dependencies": {
-    "chromedriver": "^107.0.3"
+    "chromedriver": "^124.0.2"
   }
 }

test/test.js

@@ -56,18 +56,29 @@ describe('Application life cycle test', function () {
         expect(app).to.be.an('object');
     }
 
-    async function login() {
-        await browser.get(`https://${app.fqdn}/login`);
-        await waitForElement(By.xpath('//input[@name="username"]'));
-        await browser.findElement(By.xpath('//input[@name="username"]')).sendKeys(username);
-        await browser.findElement(By.xpath('//input[@name="password"]')).sendKeys(password);
-        await browser.findElement(By.id('login')).click();
+    async function login(session = true) {
+        await browser.get(`https://${app.fqdn}`);
+        await waitForElement(By.id('loginProceedButton'));
+        await browser.findElement(By.id('loginProceedButton')).click();
+
+        if (!session) {
+            await waitForElement(By.id('inputUsername'));
+            await browser.findElement(By.id('inputUsername')).sendKeys(username);
+            await browser.findElement(By.id('inputPassword')).sendKeys(password);
+            await browser.findElement(By.id('loginSubmitButton')).click();
+        }
+
         await waitForElement(By.xpath('//a[text()="Alerts"]'));
     }
 
     async function logout() {
         await browser.get(`https://${app.fqdn}/logout`);
-        await waitForElement(By.xpath('//input[@name="username"]'));
+        await waitForElement(By.id('loginProceedButton'));
+    }
+
+    async function loadApp() {
+        await browser.get(`https://${app.fqdn}`);
+        await waitForElement(By.xpath('//a[text()="Alerts"]'));
     }
 
     xit('build app', function () { execSync('cloudron build', EXEC_ARGS); });
@@ -75,12 +86,12 @@ describe('Application life cycle test', function () {
 
     it('can get app information', getAppInfo);
 
-    it('can login', login);
-    it('can logout', logout);
+    it('can login', login.bind(null, false));
+    it('can load app', loadApp);
 
     it('can restart app', function () { execSync(`cloudron restart --app ${app.id}`, EXEC_ARGS); });
-    it('can login', login);
-    it('can logout', logout);
+
+    it('can load app', loadApp);
 
     it('backup app', function () { execSync(`cloudron backup create --app ${app.id}`, EXEC_ARGS); });
     it('restore app', function () {
@@ -91,13 +102,13 @@ describe('Application life cycle test', function () {
         execSync(`cloudron restore --backup ${backups[0].id} --app ${app.id}`, EXEC_ARGS);
     });
 
-    it('can login', login);
-    it('can logout', logout);
+    it('can load app', loadApp);
 
     it('move to different location', function () { execSync(`cloudron configure --location ${LOCATION}2 --app ${app.id}`, EXEC_ARGS); });
     it('can get app information', getAppInfo);
 
     it('can login', login);
+    it('can load app', loadApp);
     it('can logout', logout);
 
     it('uninstall app', function () { execSync(`cloudron uninstall --app ${app.id}`, EXEC_ARGS); });
@@ -105,9 +116,15 @@ describe('Application life cycle test', function () {
     // test update
     it('can install app', function () { execSync(`cloudron install --appstore-id io.prometheus.cloudronapp --location ${LOCATION}`, EXEC_ARGS); });
     it('can get app information', getAppInfo);
+
+    // it('can login', login);
+    it('can load app', loadApp);
+
     it('can update', function () { execSync(`cloudron update --app ${app.id}`, EXEC_ARGS); });
-    it('can login', login);
+
+    it('can load app', loadApp);
     it('can logout', logout);
+
     it('uninstall app', function () { execSync(`cloudron uninstall --app ${app.id}`, EXEC_ARGS); });
 });