On 2021/03/05 14:29, Landry Breuil wrote:
> On Fri, Mar 05, 2021 at 02:20:58PM +0100, Landry Breuil wrote:
> > Hi,
> >
> >
> > here's an update to loki 2.1.0, cf
> > https://github.com/grafana/loki/releases/ for the various relnotes since
> > the 1.4.1 we're having now. Totally untested on OpenBSD, but im using it
> > on debian .. so might as well update the port.
>
> Even better with non-ether diff.
OK.
While you're there, can you add daemon_logger="daemon.info" to loki.rc please?
(Not for promtail though, it could end up in a nasty loop..)
Pity promtail's syslog-over-TCP ingester (which uses influxdata/go-syslog)
only does RFC5424 and doesn't work with messages from OpenBSD syslogd though..
level=warn ts=2021-03-06T12:39:18.055119653Z caller=syslogtarget.go:183
msg="error parsing syslog stream" err="expecting a version value in the range
1-999 [col 7]"
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/loki/Makefile,v
> retrieving revision 1.2
> diff -u -r1.2 Makefile
> --- Makefile 29 May 2020 04:58:05 -0000 1.2
> +++ Makefile 5 Mar 2021 13:18:15 -0000
> @@ -4,7 +4,7 @@
>
> GH_ACCOUNT = grafana
> GH_PROJECT = loki
> -GH_TAGNAME = v1.4.1
> +GH_TAGNAME = v2.1.0
>
> CATEGORIES = sysutils
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/loki/distinfo,v
> retrieving revision 1.2
> diff -u -r1.2 distinfo
> --- distinfo 29 May 2020 04:58:05 -0000 1.2
> +++ distinfo 5 Mar 2021 13:18:15 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (loki-1.4.1.tar.gz) = KjbjS16OPN0mon0tpcADEBo/YboFhsvrmAWdqGtZVIA=
> -SIZE (loki-1.4.1.tar.gz) = 16155273
> +SHA256 (loki-2.1.0.tar.gz) = zszE5CpxWMoLxJkDo/vjHIzVX4X1C6yKi7qYQ7T4zW8=
> +SIZE (loki-2.1.0.tar.gz) = 23316117
> Index: patches/patch-cmd_loki_loki-local-config_yaml
> ===================================================================
> RCS file:
> /cvs/ports/sysutils/loki/patches/patch-cmd_loki_loki-local-config_yaml,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 patch-cmd_loki_loki-local-config_yaml
> --- patches/patch-cmd_loki_loki-local-config_yaml 7 Mar 2020 10:12:55
> -0000 1.1.1.1
> +++ patches/patch-cmd_loki_loki-local-config_yaml 5 Mar 2021 13:18:15
> -0000
> @@ -3,16 +3,23 @@
> Index: cmd/loki/loki-local-config.yaml
> --- cmd/loki/loki-local-config.yaml.orig
> +++ cmd/loki/loki-local-config.yaml
> -@@ -27,10 +27,10 @@ schema_config:
> +@@ -29,15 +29,15 @@ schema_config:
>
> storage_config:
> - boltdb:
> -- directory: /tmp/loki/index
> -+ directory: /var/loki/index
> -
> + boltdb_shipper:
> +- active_index_directory: /tmp/loki/boltdb-shipper-active
> +- cache_location: /tmp/loki/boltdb-shipper-cache
> ++ active_index_directory: /var/loki/boltdb-shipper-active
> ++ cache_location: /var/loki/boltdb-shipper-cache
> + cache_ttl: 24h # Can be increased for faster performance over
> longer query periods, uses more disk space
> + shared_store: filesystem
> filesystem:
> - directory: /tmp/loki/chunks
> + directory: /var/loki/chunks
>
> + compactor:
> +- working_directory: /tmp/loki/boltdb-shipper-compactor
> ++ working_directory: /var/loki/boltdb-shipper-compactor
> + shared_store: filesystem
> +
> limits_config:
> - enforce_metric_name: false
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/sysutils/loki/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -r1.2 PLIST
> --- pkg/PLIST 29 May 2020 04:58:05 -0000 1.2
> +++ pkg/PLIST 5 Mar 2021 13:18:15 -0000
> @@ -37,6 +37,5 @@
> @sample ${SYSCONFDIR}/promtail/promtail-config.yaml
> @mode 0750
> @owner _loki
> -@group _loki
> @sample /var/loki/
> @sample /var/promtail/
