Accepting request 899047 from home:-miska-:influx

Update and improve default setup.

Depends on rq#899040

OBS-URL: https://build.opensuse.org/request/show/899047
OBS-URL: https://build.opensuse.org/package/show/server:database/influxdb2?expand=0&rev=6

_service

@@ -2,7 +2,7 @@
 	<service name="tar_scm" mode="disabled">
 		<param name="url">git://github.com/influxdata/influxdb.git</param>
 		<param name="scm">git</param>
-		<param name="revision">2.0.6</param>
+		<param name="revision">v2.0.7</param>
 		<param name="versionformat">@PARENT_TAG@</param>
 		<param name="changesgenerate">disable</param>
 		<param name="versionrewrite-pattern">v(.*)</param>

config.yaml

@@ -0,0 +1,24 @@
+# Default configuration overrides for Influxdb 2.0
+# To see all available options, use the following command:
+#    INFLUXD_CONFIG_PATH=/etc/influxdb2/config.yaml influxd print-config
+
+# No reporting by default
+reporting-disable: true
+
+# Avoid OOM, adjust according to your HW specs
+# By default it can easily exhaust RAM, so play it safe by default
+
+# Reduce number of concurrently running queries
+query-concurrency: 8
+query-queue-size: 128
+# Maximum memory for all queries - 512M
+query-max-memory-bytes: 536870912
+# Maximum memory per query - 64M
+query-memory-bytes: 67108863
+
+# Allow to move storage to different directory
+
+# Metadata
+# bolt-path: /var/lib/influxdb/.influxdbv2/influxd.bolt
+# Time series data
+# engine-path: /var/lib/influxdb/.influxdbv2/engine

influxdb.service

@@ -4,6 +4,8 @@ Documentation=https://docs.influxdata.com/influxdb/
 After=network.target
 
 [Service]
+Environment="INFLUXD_CONFIG_PATH=/etc/influxdb2/config.yaml"
+LimitNOFILE=65536
 ExecStart=/usr/bin/influxd --assets-path="/usr/share/influxdb2/ui"
 Type=simple
 StandardOutput=journal

influxdb2-2.0.6.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:30e6807f34e94ff8a47cfbd71bd8d194d5ccb0a9dbf9b6b8821edf24a0c5b914
-size 11121036

influxdb2-2.0.7.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c46e91957315ef6ebcad82adb11dd78a9253fef468714870123efeaeb9bb6fe5
+size 11122748

influxdb2.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Jun 10 09:02:02 UTC 2021 - Michal Hrusecky <michal.hrusecky@opensuse.org>
+
+- Reintroduce configuration file in etc and provide example configuration:
+  * no tracking by default
+  * conservative memory limits to prevent OOM
+  * description how to obtain list of possible values
+  * example how to move stored data into different directory
+
+-------------------------------------------------------------------
+Thu Jun 10 08:22:49 UTC 2021 - Michal Hrusecky <michal.hrusecky@opensuse.org>
+
+- Update to version 2.0.7, see
+  * https://github.com/influxdata/influxdb/releases/tag/v2.0.7
+
 -------------------------------------------------------------------
 Thu May 27 20:56:22 UTC 2021 - Michal Hrusecky <michal.hrusecky@opensuse.org>
 

influxdb2.spec

@@ -20,15 +20,16 @@ Name:           influxdb2
 Summary:        Scalable datastore for metrics, events, and real-time analytics
 License:        MIT
 Group:          Productivity/Databases/Servers
-Version:        2.0.6
+Version:        2.0.7
 Release:        0
 URL:            https://github.com/influxdata/influxdb
 Source:         %{name}-%{version}.tar.xz
 Source1:        influxdb.service
 Source2:        influxdb.tmpfiles
 Source3:        influxdb-user.conf
+Source4:        config.yaml
 # Prebuild UI assets as specified in ./ui/fetch_ui_assets.sh
-Source98:       ui-assets-2.0.5.tar.gz
+Source98:       ui-assets-2.0.7.tar.xz
 Source99:       vendor.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  sysuser-tools
@@ -86,6 +87,7 @@ install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/influxdb.service
 ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcinfluxdb
 install -D -m 0644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/influxdb.conf
 install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/influxdb-user.conf
+install -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/influxdb2/config.yaml
 install -D -m 0755 -t %{buildroot}%{_bindir} %{_builddir}/go/bin/*
 
 %check
@@ -107,6 +109,8 @@ install -D -m 0755 -t %{buildroot}%{_bindir} %{_builddir}/go/bin/*
 %files
 %license LICENSE
 %doc README.md CHANGELOG.md
+%dir %{_sysconfdir}/influxdb2
+%config(noreplace) %{_sysconfdir}/influxdb2/config.yaml
 %{_bindir}/chronograf-migrator
 %{_bindir}/influx
 %{_bindir}/influxd

ui-assets-2.0.5.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:37ffbc072ba801ec5a0abdd76a3f19a8cd75f59856274e20630929f73cedaf55
-size 76859523

ui-assets-2.0.7.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c486fa08201153c6c2df26a1f8d504a90b9f7309476b55a8e03fb3ecfbafd39
+size 42190096

vendor.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6bf8d16f72648d8438898066f22bff0d6ea724c2a04d72ac449e7828a414f8a5
+oid sha256:8c5a31d365cfdd52e1aaef272b94e2de6497156bea306623190bea574abd2b50
-size 7386816
+size 7694248