Address review comments for VictoriaMetrics.

omniosorg · Sep 2, 2024 · 8c6fc37 · 8c6fc37
1 parent 693ad80
commit 8c6fc37
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git a/build/victoriametrics/build.sh b/build/victoriametrics/build.sh
@@ -17,12 +17,12 @@
 . ../../lib/build.sh
 
 PROG=victoriametrics
-VER=1.102.1
+VER=1.102.2
 PKG=ooce/database/victoriametrics
 SUMMARY="VictoriaMetrics"
 DESC="Fast, cost-effective monitoring solution and time series database."
 
-DATA=var/lib/victoria-metrics-data
+DATA=var/${PREFIX#/}/$PROG
 
 set_arch 64
 set_gover
@@ -45,8 +45,10 @@ build() {
     export CGO_ENABLED=0
     export GOOS=illumos
 
-    logcmd gmake victoria-metrics-pure || logerr "Unable to build victoria-metrics-pure"
-    logcmd gmake vmutils-pure || logerr "Unable to build vmutils-pure"
+    logcmd $MAKE victoria-metrics-pure \
+        || logerr "Unable to build victoria-metrics-pure"
+    logcmd $MAKE vmutils-pure \
+        || logerr "Unable to build vmutils-pure"
 
     popd >/dev/null
 }

diff --git a/build/victoriametrics/files/victoriametrics-template.xml b/build/victoriametrics/files/victoriametrics-template.xml
@@ -47,7 +47,7 @@
             <method_context>
                 <method_credential user="$(USER)"
                                    group="$(GROUP)"
-                                   privileges="basic,net_privaddr" />
+                                   privileges="basic" />
                 <method_environment>
                     <envvar name="VM_storageDataPath"
                             value="/$(DATA)" />
@@ -116,7 +116,7 @@
             <method_context>
                 <method_credential user="$(USER)"
                                    group="$(GROUP)"
-                                   privileges="basic,net_privaddr" />
+                                   privileges="basic" />
             </method_context>
 
             <exec_method type="method"

diff --git a/build/victoriametrics/local.mog b/build/victoriametrics/local.mog
@@ -16,7 +16,7 @@ dir path=$(DATA) owner=$(USER) group=$(GROUP) mode=0700
 
 group groupname=$(GROUP) gid=93
 user ftpuser=false username=$(USER) uid=93 group=$(GROUP) \
-    gcos-field="VictoriaMetrics - time series database" \
+    gcos-field="VictoriaMetrics user" \
     home-dir=/$(DATA) password=NP
 
 file ./tmp/victoria-metrics-profile.xml \

diff --git a/doc/baseline b/doc/baseline
@@ -63,6 +63,7 @@ extra.omnios ooce/database/postgresql-16/mysql_fdw
 extra.omnios ooce/database/postgresql-16/pg_repack
 extra.omnios ooce/database/postgresql-common
 extra.omnios ooce/database/rrdtool
+extra.omnios ooce/database/victoriametrics
 extra.omnios ooce/developer/aarch64-gcc10
 extra.omnios ooce/developer/aarch64-gnu-binutils
 extra.omnios ooce/developer/aarch64-linker

diff --git a/doc/baseline.aarch64 b/doc/baseline.aarch64
@@ -10,6 +10,7 @@ extra.omnios ooce/database/mariadb-106
 extra.omnios ooce/database/mariadb-common
 extra.omnios ooce/database/postgresql-14
 extra.omnios ooce/database/postgresql-common
+extra.omnios ooce/database/victoriametrics
 extra.omnios ooce/developer/cmake
 extra.omnios ooce/developer/git-absorb
 extra.omnios ooce/developer/ninja

diff --git a/doc/idlist.md b/doc/idlist.md
@@ -58,7 +58,7 @@
 | extra		| 90	| postgres
 | extra		| 91	| subversion
 | omnios	| 92	| sshd
-| extra     | 93    | victoriametrics
+| extra		| 93	| victoriametrics
 | illumos	| 95	| svctag
 | illumos	| 96	| unknown
 | pkg5		| 97	| pkg5srv
@@ -123,7 +123,7 @@
 | extra		| 90	| postgres
 | extra		| 91	| subversion
 | omnios	| 92	| sshd
-| extra     | 93    | victoriametrics
+| extra		| 93	| victoriametrics
 | illumos	| 95	| slocate
 | illumos	| 96	| unknown
 | pkg5		| 97	| pkg5srv

diff --git a/doc/packages.md b/doc/packages.md
@@ -47,7 +47,7 @@
 | ooce/database/postgresql-XX/mysql_fdw	| 2.9.1	| https://github.com/EnterpriseDB/mysql_fdw/releases | [omniosorg](https://github.com/omniosorg)
 | ooce/database/postgresql-XX/pg_repack	| 1.5.0	| https://github.com/reorg/pg_repack/tags | [omniosorg](https://github.com/omniosorg)
 | ooce/database/rrdtool		| 1.8.0		| https://github.com/oetiker/rrdtool-1.x/releases | [omniosorg](https://github.com/omniosorg)
-| ooce/database/victoriametrics | 1.102.1 | https://github.com/VictoriaMetrics/VictoriaMetrics | [gkoh](https://github.com/gkoh)
+| ooce/database/victoriametrics	| 1.102.2	| https://github.com/VictoriaMetrics/VictoriaMetrics | [gkoh](https://github.com/gkoh)
 | ooce/developer/autoconf-archive | 2023.02.20	| https://ftp.gnu.org/gnu/autoconf-archive/ | [omniosorg](https://github.com/omniosorg)
 | ooce/developer/autogen	| 5.18.16	| https://ftp.gnu.org/gnu/autogen/ | [omniosorg](https://github.com/omniosorg)
 | ooce/developer/bazel		| 6.3.2		| https://github.com/bazelbuild/bazel/releases | [omniosorg](https://github.com/omniosorg)