From 925c9afb8417ce28d2c91c00e44027ef0309e3db Mon Sep 17 00:00:00 2001
From: Douglas Camata <159076+douglascamata@users.noreply.github.com>
Date: Tue, 4 Oct 2022 16:37:34 +0200
Subject: [PATCH 1/2] Update README (#343)
* Update README
- Added instructions for macOS
- Fixed jsonnet deps command
Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>
* Update OpenShift templates doc link
Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>
Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>
---
README.md | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 92a8c8089af..9817033e05d 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,13 @@ See our [website](https://rhobs-handbook.netlify.app/) for more information abou
* Go 1.17+
+### macOS
+
+* findutils (for GNU xargs)
+* gnu-sed
+
+Both can be installed using Homebrew: `brew install gnu-sed findutils`. Afterwards, update the `SED` and `XARGS` variables in the Makefile to use `gsed` and `gxargs` or replace them in your environment.
+
## Usage
This repository contains [Jsonnet](https://jsonnet.org/) configuration that allows generating Kubernetes objects that compose RHOBS service and its observability.
@@ -16,9 +23,9 @@ This repository contains [Jsonnet](https://jsonnet.org/) configuration that allo
The jsonnet files for RHOBS service can be found in [services](./services) directory. In order to compose *RHOBS Service* we import many Jsonnet libraries from different open source repositories including [kube-thanos](https://github.com/thanos-io/kube-thanos) for Thanos components, [Observatorium](https://github.com/observatorium/observatorium) for Observatorium, Minio, Memcached, Gubernator, Dex components, [thanos-receive-controller](https://github.com/observatorium/thanos-receive-controller) for Thanos receive controller component, [parca](https://github.com/parca-dev/parca) for Parca component, [observatorium api](https://github.com/observatorium/api) for API component, [observatorium up](https://github.com/observatorium/up) for up component, [rules-objstore](https://github.com/observatorium/rules-objstore) for rules-objstore component.
-Currently, RHOBS components are rendered as [OpenShift Templates](https://docs.openshift.com/container-platform/4.7/openshift_images/using-templates.html) that allows parameters. This is how we deploy to multiple clusters, sharing the same configuration core, but having different details like resources or names.
+Currently, RHOBS components are rendered as [OpenShift Templates](https://docs.openshift.com/container-platform/latest/openshift_images/using-templates.html) that allows parameters. This is how we deploy to multiple clusters, sharing the same configuration core, but having different details like resources or names.
-> This is why there might be a gap between vanilla [Observatorium](https://github.com/observatorium/observatorium) and RHOBS. We have plans to resolve this gap in the future.
+> This is why there might be a gap between vanilla [Observatorium](https://github.com/observatorium/observatorium) and RHOBS. We have plans to resolve this gap in the future.
Running `make manifests` generates all required files into [resources/services](./resources/services) directory.
@@ -30,13 +37,13 @@ Running `make prometheusrules grafana` generates all required files into [resour
### Updating Dependencies
-Up-to-date list of jsonnet dependencies can be found in [jsonnetfile.json](./jsonnetfile.json). Fetching all deps is done through `make vendor` utility.
+Up-to-date list of jsonnet dependencies can be found in [jsonnetfile.json](./jsonnetfile.json). Fetching all deps is done through `make vendor_jsonnet` utility.
To update a dependency, normally the process would be:
```console
-make vendor # This installs dependencies like `jb` thanks to bingo project.
-JB=`ls .bin/jb-* -t | head -1`
+make vendor_jsonnet # This installs dependencies like `jb` thanks to Bingo project.
+JB=`ls $(go env GOPATH)/bin/jb-* -t | head -1`
# Updates `kube-thanos` to master and sets the new hash in `jsonnetfile.lock.json`.
$JB update https://github.com/thanos-io/kube-thanos/jsonnet/kube-thanos@main
From a4142542f5c7bfb8b77fb558e44b434fbfb23e6c Mon Sep 17 00:00:00 2001
From: Matej Gera <38492574+matej-g@users.noreply.github.com>
Date: Wed, 5 Oct 2022 10:24:59 +0200
Subject: [PATCH 2/2] Disable compression on receive (#346)
Signed-off-by: Matej Gera <matejgera@gmail.com>
Signed-off-by: Matej Gera <matejgera@gmail.com>
---
resources/services/observatorium-metrics-template.yaml | 1 +
services/observatorium-metrics-template-overwrites.libsonnet | 1 +
2 files changed, 2 insertions(+)
diff --git a/resources/services/observatorium-metrics-template.yaml b/resources/services/observatorium-metrics-template.yaml
index 4b4decd5704..332d9d7c5ae 100644
--- a/resources/services/observatorium-metrics-template.yaml
+++ b/resources/services/observatorium-metrics-template.yaml
@@ -1958,6 +1958,7 @@ objects:
"type": "JAEGER"
- --receive.default-tenant-id=FB870BF3-9F3A-44FF-9BF7-D7A047A52F43
- --receive.hashrings-algorithm=${THANOS_RECEIVE_HASHRINGS_ALGORITHM}
+ - --receive.grpc-compression=none
env:
- name: NAME
valueFrom:
diff --git a/services/observatorium-metrics-template-overwrites.libsonnet b/services/observatorium-metrics-template-overwrites.libsonnet
index 8e0445d6532..d9d92187b6c 100644
--- a/services/observatorium-metrics-template-overwrites.libsonnet
+++ b/services/observatorium-metrics-template-overwrites.libsonnet
@@ -402,6 +402,7 @@ local thanosRuleSyncer = import './sidecars/thanos-rule-syncer.libsonnet';
args+: [
'--receive.default-tenant-id=FB870BF3-9F3A-44FF-9BF7-D7A047A52F43',
'--receive.hashrings-algorithm=${THANOS_RECEIVE_HASHRINGS_ALGORITHM}',
+ '--receive.grpc-compression=none',
],
env+: s3EnvVars + [{
name: 'DEBUG',