From ad6ecab4444ebf101541788d83b48d5bb4b62347a9decc6f7f8f252562614b5f Mon Sep 17 00:00:00 2001 From: Matwey Kornilov Date: Fri, 11 Jun 2021 08:28:59 +0000 Subject: [PATCH] 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 +- config.yaml | 24 ++++++++++++++++++++++++ influxdb.service | 2 ++ influxdb2-2.0.6.tar.xz | 3 --- influxdb2-2.0.7.tar.xz | 3 +++ influxdb2.changes | 15 +++++++++++++++ influxdb2.spec | 8 ++++++-- ui-assets-2.0.5.tar.gz | 3 --- ui-assets-2.0.7.tar.xz | 3 +++ vendor.tar.xz | 4 ++-- 10 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 config.yaml delete mode 100644 influxdb2-2.0.6.tar.xz create mode 100644 influxdb2-2.0.7.tar.xz delete mode 100644 ui-assets-2.0.5.tar.gz create mode 100644 ui-assets-2.0.7.tar.xz diff --git a/_service b/_service index 870af2c..0bc1db9 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git://github.com/influxdata/influxdb.git git - 2.0.6 + v2.0.7 @PARENT_TAG@ disable v(.*) diff --git a/config.yaml b/config.yaml new file mode 100644 index 0000000..7bb2785 --- /dev/null +++ b/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 diff --git a/influxdb.service b/influxdb.service index 5ff08c7..8dd178f 100644 --- a/influxdb.service +++ b/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 diff --git a/influxdb2-2.0.6.tar.xz b/influxdb2-2.0.6.tar.xz deleted file mode 100644 index fbf72cb..0000000 --- a/influxdb2-2.0.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30e6807f34e94ff8a47cfbd71bd8d194d5ccb0a9dbf9b6b8821edf24a0c5b914 -size 11121036 diff --git a/influxdb2-2.0.7.tar.xz b/influxdb2-2.0.7.tar.xz new file mode 100644 index 0000000..b725ea0 --- /dev/null +++ b/influxdb2-2.0.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c46e91957315ef6ebcad82adb11dd78a9253fef468714870123efeaeb9bb6fe5 +size 11122748 diff --git a/influxdb2.changes b/influxdb2.changes index 2527161..0835891 100644 --- a/influxdb2.changes +++ b/influxdb2.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Jun 10 09:02:02 UTC 2021 - Michal Hrusecky + +- 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 + +- 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 diff --git a/influxdb2.spec b/influxdb2.spec index c7de906..8c80e41 100644 --- a/influxdb2.spec +++ b/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 diff --git a/ui-assets-2.0.5.tar.gz b/ui-assets-2.0.5.tar.gz deleted file mode 100644 index 139e1a9..0000000 --- a/ui-assets-2.0.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:37ffbc072ba801ec5a0abdd76a3f19a8cd75f59856274e20630929f73cedaf55 -size 76859523 diff --git a/ui-assets-2.0.7.tar.xz b/ui-assets-2.0.7.tar.xz new file mode 100644 index 0000000..efdcb8a --- /dev/null +++ b/ui-assets-2.0.7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6c486fa08201153c6c2df26a1f8d504a90b9f7309476b55a8e03fb3ecfbafd39 +size 42190096 diff --git a/vendor.tar.xz b/vendor.tar.xz index f2c09af..7f41ed9 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6bf8d16f72648d8438898066f22bff0d6ea724c2a04d72ac449e7828a414f8a5 -size 7386816 +oid sha256:8c5a31d365cfdd52e1aaef272b94e2de6497156bea306623190bea574abd2b50 +size 7694248