upgpkg: promscale 0.4.0-1

New upstream release.

Renamed systemd files to be more descriptive, naming them after $pkgname
is a bit ambiguous.

5 files changed, 45 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4e0d7ee726ce..9970798720a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = promscale
 	pkgdesc = An open source analytical platform for Prometheus metrics
-	pkgver = 0.3.0
+	pkgver = 0.4.0
 	pkgrel = 1
 	url = https://github.com/timescale/promscale
 	arch = x86_64
@@ -11,14 +11,14 @@ pkgbase = promscale
 	optdepends = prometheus
 	optdepends = promscale_extension
 	backup = etc/conf.d/promscale
-	source = promscale-0.3.0.tar.gz::https://github.com/timescale/promscale/archive/0.3.0.tar.gz
-	source = promscale.service
-	source = promscale.sysusers.conf
-	source = promscale.conf
-	b2sums = b0f25128107a21368d28da462897accf10ba048b5b4de4ff9db39dd1157710063f626a515faf0316b701c382eef7fc7fa8ca452bc20ddb2b0593baf0edb05331
+	source = promscale-0.4.0.tar.gz::https://github.com/timescale/promscale/archive/0.4.0.tar.gz
+	source = systemd.service
+	source = sysusers.conf
+	source = environment.conf
+	b2sums = d00232917f9e68be59c8ec3083683715ea4de18027afeaa66f4e2696f966781f90da3bf3d7cdc4e9d4e455e6ae92a9d878bc28adf5367b536a01892f019f0eae
 	b2sums = 23a357e2fd252d1f6c1cd8d3cd4174bdd27d0ae5035f5afd08ac377405868ad0cc5d782fb5a73fcfdbd7169361e2c4b639aa096ebfe2d9adf95ffc1e26caa3b1
 	b2sums = 2fae9c07cd255528a1c87062650956b857caa8a3c656b59e85d740f527433f510a8fe18025e03480d9145673e6dd03867d60ead5a48044353262105a173cbbfd
-	b2sums = 2495de270a7037dc51ea8b6e75742f07fd98995da4f928aaeb2b5d3ef41094f9fa8a5cd1836fc05c246192255c34c85bb80a056e12986094b4f80634e1450237
+	b2sums = 959678ca6aa24c89249db7b3e273a659c2676ff220bee60e6c753f969b1b65f4e14a5e3f6ffcba304c4e880822929ae1125e9b468ebe24385881051e99e3752e
 
 pkgname = promscale
 
diff --git a/PKGBUILD b/PKGBUILD
index ad23e51ca551..f9e74dd12355 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,28 @@
 # Maintainer: George Rawlinson <george@rawlinson.net.nz>
 
 pkgname=promscale
-pkgver=0.3.0
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="An open source analytical platform for Prometheus metrics"
 arch=('x86_64')
 url="https://github.com/timescale/promscale"
-license=(Apache)
-depends=(glibc)
-makedepends=(go)
-checkdepends=()
+license=('Apache')
+depends=('glibc')
+makedepends=('go')
 optdepends=(
-  timescaledb
-  prometheus
-  promscale_extension
+  'timescaledb'
+  'prometheus'
+  'promscale_extension'
 )
 backup=("etc/conf.d/promscale")
 source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
-        "$pkgname.service"
-        "$pkgname.sysusers.conf"
-        "$pkgname.conf")
-b2sums=('b0f25128107a21368d28da462897accf10ba048b5b4de4ff9db39dd1157710063f626a515faf0316b701c382eef7fc7fa8ca452bc20ddb2b0593baf0edb05331'
+        "systemd.service"
+        "sysusers.conf"
+        "environment.conf")
+b2sums=('d00232917f9e68be59c8ec3083683715ea4de18027afeaa66f4e2696f966781f90da3bf3d7cdc4e9d4e455e6ae92a9d878bc28adf5367b536a01892f019f0eae'
         '23a357e2fd252d1f6c1cd8d3cd4174bdd27d0ae5035f5afd08ac377405868ad0cc5d782fb5a73fcfdbd7169361e2c4b639aa096ebfe2d9adf95ffc1e26caa3b1'
         '2fae9c07cd255528a1c87062650956b857caa8a3c656b59e85d740f527433f510a8fe18025e03480d9145673e6dd03867d60ead5a48044353262105a173cbbfd'
-        '2495de270a7037dc51ea8b6e75742f07fd98995da4f928aaeb2b5d3ef41094f9fa8a5cd1836fc05c246192255c34c85bb80a056e12986094b4f80634e1450237')
+        '959678ca6aa24c89249db7b3e273a659c2676ff220bee60e6c753f969b1b65f4e14a5e3f6ffcba304c4e880822929ae1125e9b468ebe24385881051e99e3752e')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -44,19 +43,21 @@ build() {
 
 package() {
   # systemd integration
-  install -Dm644 -t "$pkgdir/usr/lib/systemd/system" "$srcdir/$pkgname.service"
-  install -Dm644 "$srcdir/$pkgname.sysusers.conf" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+  install -Dm644 systemd.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  install -Dm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
 
   # environment variable file
-  install -Dm640 "$srcdir/$pkgname.conf" "$pkgdir/etc/conf.d/$pkgname"
+  install -Dm640 environment.conf "$pkgdir/etc/conf.d/$pkgname"
+
+  cd "$pkgname-$pkgver"
 
   # documentation
-  install -Dm644 "$pkgname-$pkgver/cmd/prom-migrator/README.md" "$pkgdir/usr/share/doc/$pkgname/prom-migrator.md"
-  install -Dm644 "$pkgname-$pkgver/README.md" "$pkgdir/usr/share/doc/$pkgname/README.md"
-  cp -r "$pkgname-$pkgver/docs" "$pkgdir/usr/share/doc/$pkgname"
+  install -Dm644 cmd/prom-migrator/README.md "$pkgdir/usr/share/doc/$pkgname/prom-migrator.md"
+  install -Dm644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
+  cp -r docs "$pkgdir/usr/share/doc/$pkgname"
 
   # binaries
   install -Dm755 -t "$pkgdir/usr/bin" \
-    "$pkgname-$pkgver/build_output/$pkgname" \
-    "$pkgname-$pkgver/build_output/prom-migrator"
+    "build_output/$pkgname" \
+    build_output/prom-migrator
 }
diff --git a/promscale.conf b/environment.conf
index d87b7903a7db..3b895f26a280 100644
--- a/promscale.conf
+++ b/environment.conf
@@ -3,7 +3,7 @@ PROMSCALE_ARGS=""
 
 # Available arguments and environment variables:
 #  -app string
-#        'app' sets application_name in database connection string. This is helpful during debugging when looking at pg_stat_activity. [PROMSCALE_APP] [TS_PROM_APP] (default "promscale@0.3.0")
+#        'app' sets application_name in database connection string. This is helpful during debugging when looking at pg_stat_activity. [PROMSCALE_APP] [TS_PROM_APP] (default "promscale@0.4.0")
 #  -async-acks
 #        Acknowledge asynchronous inserts. If this is true, the inserter will not wait after insertion of metric data in the database. This increases throughput at the cost of a small chance of data loss. [PROMSCALE_ASYNC_ACKS] [TS_PROM_ASYNC_ACKS]
 #  -auth-password string
@@ -42,8 +42,8 @@ PROMSCALE_ARGS=""
 #        TimescaleDB/Vanilla Postgres user. [PROMSCALE_DB_USER] [TS_PROM_DB_USER] (default "postgres")
 #  -db-writer-connection-concurrency int
 #        Maximum number of database connections for writing per go process. [PROMSCALE_DB_WRITER_CONNECTION_CONCURRENCY] [TS_PROM_DB_WRITER_CONNECTION_CONCURRENCY] (default 4)
-#  -enable-ha
-#        Enable external_labels based HA. [PROMSCALE_ENABLE_HA] [TS_PROM_ENABLE_HA]
+#  -high-availability
+#        Enable external_labels based HA. [PROMSCALE_HIGH_AVAILABILITY] [TS_PROM_HIGH_AVAILABILITY]
 #  -install-extensions
 #        Install TimescaleDB, Promscale extension. [PROMSCALE_INSTALL_EXTENSIONS] [TS_PROM_INSTALL_EXTENSIONS] (default true)
 #  -labels-cache-size uint
@@ -57,17 +57,29 @@ PROMSCALE_ARGS=""
 #  -log-format string
 #        The log format to use [ 'logfmt', 'json' ]. [PROMSCALE_LOG_FORMAT] [TS_PROM_LOG_FORMAT] (default "logfmt")
 #  -log-level string
-#        Log level to use from [ 'error', 'warn', 'info', 'debug' ]. [PROMSCALE_LOG_LEVEL] [TS_PROM_LOG_LEVEL] (default "debug")
+#        Log level to use from [ 'error', 'warn', 'info', 'debug' ]. [PROMSCALE_LOG_LEVEL] [TS_PROM_LOG_LEVEL] (default "info")
 #  -memory-target value
 #        Target for max amount of memory to use. Specified in bytes or as a percentage of system memory (e.g. 80%). [PROMSCALE_MEMORY_TARGET] [TS_PROM_MEMORY_TARGET] (default 80%)
 #  -metrics-cache-size uint
 #        Maximum number of metric names to cache. [PROMSCALE_METRICS_CACHE_SIZE] [TS_PROM_METRICS_CACHE_SIZE] (default 10000)
 #  -migrate string
 #        Update the Prometheus SQL schema to the latest version. Valid options are: [true, false, only]. [PROMSCALE_MIGRATE] [TS_PROM_MIGRATE] (default "true")
+#  -multi-tenancy
+#        Use multi-tenancy mode in Promscale. [PROMSCALE_MULTI_TENANCY] [TS_PROM_MULTI_TENANCY]
+#  -multi-tenancy-allow-non-tenants
+#        Allow Promscale to ingest/query all tenants as well as non-tenants. By setting this to true, Promscale will ingest data from non multi-tenant Prometheus instances as well. If this is false, only multi-tenants (tenants listed in 'multi-tenancy-valid-tenants') are allowed for ingesting and querying data. [PROMSCALE_MULTI_TENANCY_ALLOW_NON_TENANTS] [TS_PROM_MULTI_TENANCY_ALLOW_NON_TENANTS]
+#  -multi-tenancy-valid-tenants string
+#        Sets valid tenants that are allowed to be ingested/queried from Promscale. This can be set as: 'allow-all' (default) or a comma separated tenant names. 'allow-all' makes Promscale ingest or query any tenant from itself. A comma separated list will indicate only those tenants that are authorized for operations from Promscale. [PROMSCALE_MULTI_TENANCY_VALID_TENANTS] [TS_PROM_MULTI_TENANCY_VALID_TENANTS] (default "allow-all")
 #  -promql-default-subquery-step-interval duration
 #        Default step interval to be used for PromQL subquery evaluation. This value is used if the subquery does not specify the step value explicitly. Example: <metric_name>[30m:]. Note: in Prometheus this setting is set by the evaluation_interval option. [PROMSCALE_PROMQL_DEFAULT_SUBQUERY_STEP_INTERVAL] [TS_PROM_PROMQL_DEFAULT_SUBQUERY_STEP_INTERVAL] (default 1m0s)
 #  -promql-enable-feature string
 #        [EXPERIMENTAL] Enable optional PromQL features, separated by commas. These are disabled by default in Promscale's PromQL engine. Currently, this includes 'promql-at-modifier' and 'promql-negative-offset'. For more information, see https://github.com/prometheus/prometheus/blob/master/docs/disabled_features.md [PROMSCALE_PROMQL_ENABLE_FEATURE] [TS_PROM_PROMQL_ENABLE_FEATURE]
+#  -promql-lookback-delta duration
+#        Maximum lookback duration for retrieving metrics during expression evaluations and federation. [PROMSCALE_PROMQL_LOOKBACK_DELTA] [TS_PROM_PROMQL_LOOKBACK_DELTA] (default 5m0s)
+#  -promql-max-points-per-ts int
+#        Maximum number of points per time-series in a query-range request. This calculation is an estimation, that happens as (start - end)/step where start and end are the 'start' and 'end' timestamps of the query_range. [PROMSCALE_PROMQL_MAX_POINTS_PER_TS] [TS_PROM_PROMQL_MAX_POINTS_PER_TS] (default 11000)
+#  -promql-max-samples int
+#        Maximum number of samples a single query can load into memory. Note that queries will fail if they try to load more samples than this into memory, so this also limits the number of samples a query can return. [PROMSCALE_PROMQL_MAX_SAMPLES] [TS_PROM_PROMQL_MAX_SAMPLES] (default 50000000)
 #  -promql-query-timeout duration
 #        Maximum time a query may take before being aborted. This option sets both the default and maximum value of the 'timeout' parameter in '/api/v1/query.*' endpoints. [PROMSCALE_PROMQL_QUERY_TIMEOUT] [TS_PROM_PROMQL_QUERY_TIMEOUT] (default 2m0s)
 #  -read-only
diff --git a/promscale.service b/systemd.service
index fe8656db898f..fe8656db898f 100644
--- a/promscale.service
+++ b/systemd.service
diff --git a/promscale.sysusers.conf b/sysusers.conf
index 15b235304adc..15b235304adc 100644
--- a/promscale.sysusers.conf
+++ b/sysusers.conf