diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c11831068..82840a609b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - [#970](https://github.com/openshift/cluster-monitoring-operator/pull/970) Bump prometheus-operator v0.43.0. - [#971](https://github.com/openshift/cluster-monitoring-operator/pull/971) Enable `hwmon` in node-exporter for hardware sensor data collection - [#983](https://github.com/openshift/cluster-monitoring-operator/pull/983) Remove deprecated user workload configuration +- [#995](https://github.com/openshift/cluster-monitoring-operator/pull/995) Add logLevel config field to Thanos Query. ## 4.6 diff --git a/assets/thanos-querier/deployment.yaml b/assets/thanos-querier/deployment.yaml index e58514d355..7347def83c 100644 --- a/assets/thanos-querier/deployment.yaml +++ b/assets/thanos-querier/deployment.yaml @@ -40,7 +40,6 @@ spec: containers: - args: - query - - --log.level=info - --grpc-address=127.0.0.1:10901 - --http-address=127.0.0.1:9090 - --query.replica-label=prometheus_replica diff --git a/jsonnet/thanos-querier.jsonnet b/jsonnet/thanos-querier.jsonnet index d7f413b13b..3f4a4e0ffb 100644 --- a/jsonnet/thanos-querier.jsonnet +++ b/jsonnet/thanos-querier.jsonnet @@ -270,7 +270,7 @@ local thanosQuerierRules = if std.startsWith(a, '--grpc-address=') then '--grpc-address=127.0.0.1:10901' else if std.startsWith(a, '--http-address=') then '--http-address=127.0.0.1:9090' else a, - super.args + std.filter(function(a) !std.startsWith(a, "--log.level="), super.args) ) + [ '--grpc-client-tls-secure', '--grpc-client-tls-cert=/etc/tls/grpc/client.crt', diff --git a/pkg/manifests/bindata.go b/pkg/manifests/bindata.go index 3f2efaa186..320dd855a8 100644 --- a/pkg/manifests/bindata.go +++ b/pkg/manifests/bindata.go @@ -2708,7 +2708,7 @@ func assetsThanosQuerierClusterRoleYaml() (*asset, error) { return a, nil } -var _assetsThanosQuerierDeploymentYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x59\xeb\x6f\xdc\xb8\x11\xff\xee\xbf\x82\x58\x14\xb8\x3e\x42\x69\xb5\xa9\xd3\x8b\x82\xfd\x60\x38\xee\x39\x68\x12\x1b\x67\xa3\xed\xa1\x68\x17\x34\x35\xab\x25\x96\x22\x75\x43\x4a\xb6\x70\xe8\xff\x5e\x50\xda\x87\xa8\xc7\x7a\xd7\xc5\x1d\x12\x20\xfa\x12\x2f\xf9\x9b\x19\x72\x1e\xbf\x21\x19\x96\x8b\xbf\x03\x1a\xa1\x55\x4c\x58\x9e\x9b\xb0\x8c\xce\xd6\x42\x25\x31\x79\x0f\xb9\xd4\x55\x06\xca\x9e\x65\x60\x59\xc2\x2c\x8b\xcf\x08\x91\xec\x01\xa4\x71\x7f\x11\x27\x10\xac\x8b\x07\x40\x05\x16\x4c\x20\x74\xc8\x75\x96\x6b\x05\xca\xc6\xe4\xe7\x02\xb0\xa2\x92\x55\x80\x23\x60\xa1\x8c\x65\x8a\x43\x4c\xec\x8a\x29\x6d\xa8\x13\x11\xa3\x70\xc5\x32\x1f\x5a\x8d\x00\xcb\xed\x86\xa6\x41\x34\x0b\xa6\x67\x84\xf4\x44\x1b\x2b\x6e\xd8\xe4\xcc\xad\x40\xe7\xa0\xcc\x4a\x2c\x2d\xcd\xb4\x12\x56\xa3\x50\xe9\x99\xc9\x81\xbb\x9d\x22\xe4\x52\x70\x66\x62\x32\x3b\x23\xc4\x80\x04\x6e\x35\x36\x3e\xc8\x98\xe5\xab\x8f\x2d\xa7\x9c\xe8\x96\x93\x1d\x73\xb4\x6b\x2c\x64\xb9\x64\x16\x36\xeb\x6c\xc5\xd0\x7d\xd2\x5b\xf2\xc9\x8b\x7e\xc1\xb2\x4f\x88\xe9\xb1\x71\x25\x64\x1b\xa2\x5a\x62\xb9\x14\x4a\xd8\x6a\xbf\xa9\x5c\x27\x17\xca\x8a\x8b\xde\x04\x21\x39\xc2\x12\x10\x21\x79\x5f\xb8\x58\xdf\xf1\x15\x24\x85\x14\x2a\xfd\x90\x2a\xbd\x1b\xbe\x7a\x02\x5e\x58\x67\xb4\x25\x4a\x6b\xbd\x1b\x9d\xf7\x80\x59\x7b\x72\xe7\xdb\x3b\x2f\x4d\xda\x5f\x9d\x32\x57\x4f\x39\x82\x71\xfb\x31\x7d\x04\x25\x6b\xa8\xe2\x11\x7f\xf5\xd0\xc4\x65\x2f\x32\x67\x8b\x7c\x50\x03\xd3\x25\x93\x05\x0c\x98\x71\x86\x06\x7d\xdf\x7c\xbb\xf2\xe8\x89\xd2\xe1\x7a\xf1\x41\x56\xe7\x5a\xea\xb4\xfa\x9b\xdb\x8a\xbf\x8d\x95\x36\xb6\xb7\x95\x47\x10\xe9\xca\xc6\x24\x9a\x4e\x37\xe3\x5c\x2b\xcb\x84\x02\xdc\x2d\x80\x12\x86\x69\x6b\x39\x94\xf8\x0b\xa7\x84\x52\xa9\xd3\x40\x42\x09\x72\x2e\xd4\x52\x7b\x53\x29\xe6\x9c\xb2\x24\x71\x9e\x9f\x47\xb3\xbf\x04\xd3\x60\x1a\x44\x71\x34\x7d\x3b\x8d\x3c\xe0\xca\xda\x7c\x00\xf8\x76\xfa\x76\xea\xe1\x6a\xeb\xc1\x86\x1f\x68\x1d\xf7\x79\x8e\x3a\x03\xbb\x82\xc2\x2c\x36\x13\xcf\x8a\x34\x41\x58\x60\x21\x01\x07\x85\x8c\xd5\x08\xf3\x44\x19\x83\xe5\x9f\x16\x6e\x1b\xc1\xc2\xf2\x3c\xd8\xdb\xa2\x4d\x0e\x40\x12\x0c\x85\x26\x30\x25\x0f\xb8\x2c\x8c\x05\x0c\xa4\xe6\x4c\xf6\xfd\xc2\xa5\x00\x65\xa9\x95\x86\x1a\xe0\x05\xc2\x41\x08\x07\xb4\xf3\x10\x2c\x0f\xad\x34\xa1\x9b\x0d\x9b\xd9\x80\xa3\x3d\x28\xb9\x86\x6a\x58\x70\x0d\xd5\x61\x93\xac\x2b\xc7\x0e\x1a\x33\x80\x25\x20\x75\x89\xd6\x0a\x4a\x0d\xf1\x64\x9c\xdb\x7f\x1d\xdf\x8a\x8c\xa5\xe0\xe8\x93\x55\x2e\xed\x77\xd2\xa1\x46\x91\x0a\x45\x9b\xb8\xc7\xe5\x34\x88\xce\x83\x7d\x66\x49\x51\x82\x02\x63\x6e\x51\x3f\x40\xbb\xf6\xe0\x69\xcf\x76\xdb\x12\xc9\x32\xa6\x12\x7f\x90\x12\xb3\xea\x0c\x50\xde\x19\x10\x4b\xf2\x2f\x42\x9f\xc8\xe4\x77\xbf\xdf\xe8\x20\xb4\x24\xbc\x40\xf9\x87\x09\xf9\xf7\x3b\x62\x57\xa0\x6a\x7b\xf5\x18\x71\x05\x11\x87\x61\xbd\x3d\x57\xbd\x75\x29\x84\x34\x5c\x01\x93\x76\x55\xbd\xeb\xd4\x3e\xc8\x61\xfd\x8f\x29\xd8\xae\x7e\x37\x56\xd7\x85\xa8\xff\xb5\x28\xc0\xcc\x23\x97\xf4\xb9\x48\x5a\xdd\xa3\xf9\x9e\x5b\x08\x01\x69\x80\xc0\x93\xb0\x24\x7a\x47\x96\x62\x27\x7e\xa0\xd5\xe4\x1a\xad\x47\x2a\x3b\xe2\xb9\xd5\x68\x63\xe2\x95\xfd\x56\x93\x5b\xc8\x6e\x10\x81\x25\xe2\x2b\x09\x99\x5b\xeb\x17\x10\xb0\x66\x19\xa3\xe1\x42\x30\xba\xc0\x4e\xef\x41\xf8\xb9\x00\x63\x3b\xfd\x88\xe7\x45\x4c\xce\x33\x6f\x2c\x83\x4c\x63\x15\x93\x68\xf6\x69\xaf\xd3\x02\x66\x42\x31\xd7\xcf\x3f\x81\x31\x2c\x85\x5b\x2d\x05\xaf\x62\xf2\x57\x26\xe5\x03\xe3\xeb\x7b\xfd\x51\xa7\xe6\x46\x5d\x21\xea\xfd\x46\x4a\x2d\x8b\x0c\x3e\xe9\x42\xf9\x69\x92\xb9\x91\x5b\x66\x57\x31\xf1\x88\xa9\x97\x2b\x06\x38\x82\x6d\xc8\xc9\x4a\x33\xda\xcc\x68\x8e\xba\x74\x3e\x9c\xef\xa8\xa2\x3d\xeb\x5c\x69\x76\x6d\xc9\x39\x32\xea\x4e\xef\x66\xdb\x13\x90\x31\x21\x69\xa2\x33\x26\xd4\xfc\x8f\xed\x99\x22\x37\x16\x81\x65\xf3\xc1\x28\xf9\xca\x73\x66\xcc\x63\x42\x97\x42\x42\xc3\xc3\x39\xea\xa7\x2a\xdc\x4e\x84\xac\xb0\xab\xb6\xc4\x9e\x2b\x1d\x11\x0b\x0e\x94\x71\xee\x3c\x36\x1f\x39\x1e\x52\xf2\x5d\x5b\x88\xe1\xfc\x97\xc9\x36\x0d\x26\x31\x99\xec\xcf\x23\x93\x57\x64\x52\x02\x3e\xb8\xd1\x14\xec\xe4\xbf\xdf\x8d\x28\x49\x40\x42\xca\x2c\xd0\x02\xa5\x99\xff\x32\x09\x27\x31\x39\x5a\xa9\xa7\x75\xa0\xe9\xe5\x28\x4a\x66\xc1\xfd\xdd\xed\x43\xbd\x3e\xd7\xc6\x76\xfa\xdc\xae\x5b\xd5\x39\xd2\xb8\xb7\x64\x18\x62\xa1\xc2\x66\xd0\x84\xfe\xf1\x69\xe3\xcf\x8d\x3b\x43\xab\xd7\xa0\x3c\x8d\x5a\xaf\x05\xf8\x1a\xf7\x01\xdb\xea\x34\xcd\xf1\x73\xd1\xfc\x1e\x8e\xdc\xb6\xe5\xe6\x6b\x51\x6f\xc3\x39\x20\xc8\x21\x1b\x47\x9f\xb4\xf2\x7e\x03\x37\x6b\x91\x53\x97\x49\x14\x21\x85\xa7\xf9\x7f\xc2\x0c\x2c\x0a\x6e\x76\x20\x50\x65\xbb\x64\x9a\x02\xbb\xbe\xbf\xbf\x5d\xdc\xfe\x78\xf3\xcf\x9f\x5a\xb5\x57\x1f\x7b\x63\x32\x99\x0c\xc2\xef\x4e\xc0\x7f\xbe\x39\x02\x3c\xde\xec\xeb\xfd\xd4\xce\x8f\xdd\x85\xcc\xd8\x4e\x53\x6a\x01\x4e\xe9\x49\x51\x8f\x67\x1e\xe1\xe1\xc5\x04\x1a\x0d\x13\xe8\x6c\xfa\x1b\x13\xe8\xa6\x52\xc6\x38\xd4\xe7\x8e\x16\x9b\x0e\xe9\xf3\x12\xfe\x48\x8d\x4d\x30\x9a\x12\x7a\x56\xf5\x96\xfc\x4e\xd2\xdd\x11\x1a\x68\x03\x9b\x03\x38\x95\xc2\x58\x50\x3b\x4e\x9f\xd6\xd7\x90\xa9\xe3\xe6\x99\x07\xef\xd2\xb8\x77\x63\x39\xf7\xa0\x5c\xab\xa5\x48\x5b\xa4\xe0\x0a\x94\xe2\x03\xe3\x4d\x02\x86\x0d\x20\xa8\x58\xe6\xdf\x11\xb6\xfc\xd7\x12\x7d\x86\x04\x6b\x91\xcd\xbc\x63\xc3\x03\x92\xdd\xa3\x7f\x6d\x4c\xe4\x2b\x40\x6a\x0a\x61\xc1\xcc\xef\x3f\xde\x2d\xae\x2e\xdf\x5f\x5f\x2d\x7e\xbc\xbb\x58\xfc\xe3\xc3\xfd\xf5\xe2\xe2\xea\x6e\x11\xcd\xbe\x5f\xfc\x70\xf9\x69\x71\x77\x7d\x31\x3b\x7f\xf3\x6a\x8f\xba\xba\x7c\x7f\x14\xce\xd3\x36\x3b\x7f\xb3\x45\xbd\xfe\xfe\xcf\xe3\xda\x46\x71\x3b\x6d\x97\xd7\x17\x97\xd7\x17\xb3\xe9\xe2\xf6\xe6\xe3\x4f\xd1\xeb\xe9\xf9\xb0\xb2\x1e\xac\x7b\x93\xb5\xda\xd8\x04\x10\xe7\x16\x0b\xff\x42\xc6\xa4\xd4\x8f\x34\x67\x76\x65\xe6\x21\xcb\x45\x58\x46\x61\x7d\xac\x7d\xe5\xfd\x5a\x20\x53\x29\x8c\x91\x14\xd7\x08\xda\x74\x73\xc0\x5d\x48\xde\xb4\xee\x23\x4d\x4a\x77\x40\xa7\x30\xd5\xac\x57\x1f\x16\x14\x53\xbc\xfa\xc6\x56\x2d\x7d\x63\x0e\x3e\xac\x73\x58\x6a\x88\x54\x84\x1a\xa6\x95\x03\x6c\x71\x90\x58\xfc\xa7\x90\xe6\x25\x63\x77\x9c\x7a\x26\xe3\xdc\xe5\xba\x11\xd9\xa7\x5c\xd4\x4b\xb9\x2e\xea\x0b\x4c\x97\x17\xb1\xf7\xeb\x6f\xec\xfd\x8d\xbd\x7b\xec\x8d\x85\x04\xf3\x2b\x30\x35\xf5\x15\x1f\xc1\xd7\xaf\xc7\xf8\xba\xa3\xea\xcb\x29\xc3\xaf\x9c\xb5\x3d\xbf\xe6\x28\x34\x0a\x5b\x5d\x4a\x66\xcc\xe7\x46\x49\x65\x2c\x64\x74\xf3\xca\x48\x39\x0a\x2b\xf6\x0f\x8d\x9b\x5b\xd5\x45\x73\xab\xfa\x3c\xfc\x9f\x5d\x1d\xdf\xfe\x80\x8c\xc3\x2d\xa0\xd0\xc9\x1d\x70\xad\x12\x13\x93\x68\xb6\xcd\xa4\xc6\x99\xad\x67\xf7\x63\xfd\xd3\x20\xda\xa1\x6f\x46\x86\x16\xe5\x3d\x85\x9c\x7c\x24\x3f\xc9\xd2\x80\x86\x63\x4c\xf6\x8e\xf7\x2f\x30\xda\x3b\xed\x9f\xde\xcc\x4f\xb4\x3b\x76\x22\x78\x69\x3e\xfe\x7f\xe6\x37\xaa\xfe\x17\x00\x00\xff\xff\xb7\xa7\xf6\x5e\x69\x1e\x00\x00") +var _assetsThanosQuerierDeploymentYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x59\xeb\x6f\xdc\xb8\x11\xff\xee\xbf\x82\x58\x14\xb8\x3e\x42\x69\xb5\xa9\xd3\x8b\x82\xfd\x60\x38\xee\x39\x68\x12\x1b\x67\xa3\xed\xa1\x68\x17\x34\x35\xd6\x12\x4b\x91\xbc\x21\xb5\xb6\x70\xe8\xff\x5e\x50\xda\x87\xa8\x87\xbd\xeb\xe2\x0e\x09\x10\x7d\x89\x97\xfc\xcd\x0c\x39\x8f\xdf\x90\x0c\x33\xe2\xef\x80\x56\x68\x95\x12\x66\x8c\x8d\xd7\xc9\xc9\x4a\xa8\x2c\x25\xef\xc1\x48\x5d\x15\xa0\xdc\x49\x01\x8e\x65\xcc\xb1\xf4\x84\x10\xc9\xee\x40\x5a\xff\x17\xf1\x02\xd1\xaa\xbc\x03\x54\xe0\xc0\x46\x42\xc7\x5c\x17\x46\x2b\x50\x2e\x25\x3f\x97\x80\x15\x95\xac\x02\x1c\x01\x0b\x65\x1d\x53\x1c\x52\xe2\x96\x4c\x69\x4b\xbd\x88\x18\x85\x2b\x56\x84\xd0\x6a\x04\xb8\xde\x6e\x68\x1a\x25\xb3\x68\x7a\x42\x48\x4f\xb4\xb1\xe2\x87\xad\x61\x7e\x05\xda\x80\xb2\x4b\x71\xef\x68\xa1\x95\x70\x1a\x85\xca\x4f\xac\x01\xee\x77\x8a\x60\xa4\xe0\xcc\xa6\x64\x76\x42\x88\x05\x09\xdc\x69\x6c\x7c\x50\x30\xc7\x97\x1f\x5b\x4e\x39\xd2\x2d\x47\x3b\xe6\x60\xd7\x38\x28\x8c\x64\x0e\x36\xeb\x6c\xc5\xd0\x7f\x32\x58\xf2\xd1\x8b\x7e\xc1\xb2\x8f\x88\xe9\xa1\x71\x25\x64\x1b\xa2\x5a\xe2\xfe\x5e\x28\xe1\xaa\xfd\xa6\x8c\xce\xce\x94\x13\x67\xbd\x09\x42\x0c\xc2\x3d\x20\x42\xf6\xbe\xf4\xb1\xbe\xe1\x4b\xc8\x4a\x29\x54\xfe\x21\x57\x7a\x37\x7c\xf1\x08\xbc\x74\xde\x68\x4b\x94\xd6\x7a\x37\x3a\x6f\x01\x8b\xf6\xe4\xce\xb7\x37\x41\x9a\xb4\xbf\x3a\x65\x2e\x1e\x0d\x82\xf5\xfb\xb1\x7d\x04\x25\x2b\xa8\xd2\x11\x7f\xf5\xd0\xc4\x67\x2f\x32\x6f\x8b\x7c\x50\x03\xd3\x6b\x26\x4b\x18\x30\xe3\x0d\x0d\xfa\xbe\xf9\x76\xe5\xd1\x13\xa5\xc3\xf5\x12\x82\x9c\x36\x5a\xea\xbc\xfa\x9b\xdf\x4a\xb8\x8d\xa5\xb6\xae\xb7\x95\x07\x10\xf9\xd2\xa5\x24\x99\x4e\x37\xe3\x5c\x2b\xc7\x84\x02\xdc\x2d\x80\x12\x86\x79\x6b\x39\x94\x84\x0b\xa7\x84\xd2\x1c\x0d\xa7\x2c\xcb\xbc\x7b\xe7\xc9\xec\x2f\xd1\x34\x9a\x46\x49\x9a\x4c\xdf\x4e\x93\x00\xb8\x74\xce\x0c\x00\xdf\x4e\xdf\x4e\x03\x5c\x6d\x22\xda\x90\x00\xad\x83\x3b\x37\xa8\x0b\x70\x4b\x28\xed\x62\x33\xf1\xac\x48\xe3\xe9\x05\x96\x12\x70\x50\xc8\x3a\x8d\x30\xcf\x94\xb5\xb8\xfe\xd3\xc2\x6f\x23\x5a\x38\x6e\xa2\xbd\x2d\xda\x04\x1a\xb2\x68\xc8\xff\x91\x5d\xf3\x88\xcb\xd2\x3a\xc0\x48\x6a\xce\x64\xdf\x2f\x5c\x0a\x50\x8e\x3a\x69\xa9\x05\x5e\x22\x3c\x09\xe1\x80\x6e\x1e\x83\xe3\xb1\x93\x36\xf6\xb3\x71\x33\x1b\x71\x74\x4f\x4a\xae\xa0\x1a\x16\x5c\xc1\x40\xb4\xda\x26\x59\x57\x8e\x3d\x69\xcc\x02\xae\x01\xa9\xcf\xa6\x56\x50\x6a\x48\x20\xe3\xdd\xfe\xeb\xf8\x56\x14\x2c\x07\xcf\x91\xac\xf2\xb9\xbd\x93\x8e\x35\x8a\x5c\x28\xda\xc4\x3d\x5d\x4f\xa3\xe4\x34\xda\x67\x96\x14\x6b\x50\x60\xed\x35\xea\x3b\x68\x17\x18\x3c\xee\x29\x6d\x5b\x07\x45\xc1\x54\x16\x0e\x52\x62\x97\x9d\x01\xca\x3b\x03\xe2\x9e\xfc\x8b\xd0\x47\x32\xf9\xdd\xef\x37\x3a\x08\x5d\x13\x5e\xa2\xfc\xc3\x84\xfc\xfb\x1d\x71\x4b\x50\xb5\xbd\x7a\x8c\xf8\x82\x48\xe3\xb8\xde\x9e\x2f\xd1\xba\x14\x62\x1a\x2f\x81\x49\xb7\xac\xde\x75\x0a\x1c\xe4\xb0\xfe\x87\x1c\x5c\x57\xbf\x1f\xab\xeb\x42\xd4\xff\x3a\x14\x60\xe7\x89\x4f\x7a\x23\xb2\x56\x8b\x68\xbe\xe7\x16\x42\x40\x5a\x20\xf0\x28\x1c\x49\xde\x91\x7b\xb1\x13\x7f\xa2\x9f\x18\x8d\x2e\x60\x8e\x1d\xbb\x5c\x6b\x74\x29\x09\xca\x7e\xab\xc9\x2f\x64\x37\x88\xc0\x32\xf1\x95\x84\xcc\xaf\xf5\x0b\x08\x58\xb3\x8c\xd1\x70\x21\x58\x5d\x62\xa7\xc1\x20\xfc\x5c\x82\x75\x9d\xa6\xc3\x4d\x99\x92\xd3\x22\x18\x2b\xa0\xd0\x58\xa5\x24\x99\x7d\xda\xeb\x74\x80\x85\x50\xcc\x37\xed\x4f\x60\x2d\xcb\xe1\x5a\x4b\xc1\xab\x94\xfc\x95\x49\x79\xc7\xf8\xea\x56\x7f\xd4\xb9\xbd\x52\x17\x88\x7a\xbf\x91\xb5\x96\x65\x01\x9f\x74\xa9\xc2\x34\x29\xfc\xc8\x35\x73\xcb\x94\x04\xc4\xd4\xcb\x15\x0b\x1c\xc1\x35\xe4\xe4\xa4\x1d\xed\x58\xd4\xa0\x5e\x7b\x1f\xce\x77\x54\xd1\x9e\xf5\xae\xb4\xbb\xb6\xe4\x1d\x99\x74\xa7\x77\xb3\xed\x09\x28\x98\x90\x34\xd3\x05\x13\x6a\xfe\xc7\xf6\x4c\x69\xac\x43\x60\xc5\x7c\x30\x4a\xa1\x72\xc3\xac\x7d\xc8\xe8\xbd\x90\xd0\xf0\xb0\x41\xfd\x58\xc5\xdb\x89\x98\x95\x6e\xd9\x96\xd8\x73\xa5\x27\x62\xc1\x81\x32\xce\xbd\xc7\xe6\x23\x67\x40\x4a\xbe\x6b\x0b\x31\x9c\xff\x32\xd9\xa6\xc1\x24\x25\x93\xfd\xa1\x63\xf2\x8a\x4c\xd6\x80\x77\x7e\x34\x07\x37\xf9\xef\x77\x23\x4a\x32\x90\x90\x33\x07\xb4\x44\x69\xe7\xbf\x4c\xe2\x49\x4a\x0e\x56\x1a\x68\x1d\x68\x7a\x06\xc5\x9a\x39\xf0\x7f\x77\xfb\x50\xaf\xcf\xb5\xb1\x9d\x3e\xb7\xeb\x56\x75\x8e\x34\xee\x5d\x33\x8c\xb1\x54\x71\x33\x68\xe3\xf0\x8c\xb4\xf1\xe7\xc6\x9d\xb1\xd3\x2b\x50\x81\x46\xad\x57\x02\x42\x8d\xfb\x80\x6d\x75\xda\xe6\x8c\xb9\x68\x7e\x0f\x47\x6e\xdb\x72\xcd\x4a\xd4\xdb\xf0\x0e\x88\x0c\x14\xe3\xe8\xa3\x56\xde\x6f\xe0\x76\x25\x0c\xf5\x99\x44\x11\x72\x78\x9c\xff\x27\x2e\xc0\xa1\xe0\x76\x07\x02\xb5\x6e\x97\x4c\x53\x60\x97\xb7\xb7\xd7\x8b\xeb\x1f\xaf\xfe\xf9\x53\xab\xf6\xea\xb3\x6d\x4a\x26\x93\x41\xf8\xcd\x11\xf8\xcf\x57\x07\x80\xc7\x9b\x7d\xbd\x9f\xda\xf9\xa9\xbf\x75\x59\xd7\x69\x4a\x2d\xc0\x31\x3d\x29\xe9\xf1\xcc\x03\xdc\xbd\x98\x40\x93\x61\x02\x9d\x4d\x7f\x63\x02\xdd\x54\xca\x18\x87\x86\xdc\xd1\x62\xd3\x21\x7d\x41\xc2\x1f\xa8\xb1\x09\x46\x53\x42\xcf\xaa\xde\x92\xdf\x51\xba\x3b\x42\x03\x6d\x60\x73\x00\xa7\x52\x58\x07\x6a\xc7\xe9\xd3\xfa\x1a\x32\xf5\xdc\x3c\x0b\xe0\x5d\x1a\x0f\x6e\x2c\xa7\x01\x94\x6b\x75\x2f\xf2\x16\x29\xf8\x02\xa5\x78\xc7\x78\x93\x80\x71\x03\x88\x2a\x56\x84\x77\x84\x2d\xff\xb5\x44\x9f\x21\xc1\x5a\x64\x33\xef\xd9\xf0\x09\xc9\xee\xd1\xbf\x36\x26\xcc\x12\x90\xda\x52\x38\xb0\xf3\xdb\x8f\x37\x8b\x8b\xf3\xf7\x97\x17\x8b\x1f\x6f\xce\x16\xff\xf8\x70\x7b\xb9\x38\xbb\xb8\x59\x24\xb3\xef\x17\x3f\x9c\x7f\x5a\xdc\x5c\x9e\xcd\x4e\xdf\xbc\xda\xa3\x2e\xce\xdf\x1f\x84\x0b\xb4\xcd\x4e\xdf\x6c\x51\xaf\xbf\xff\xf3\xb8\xb6\x51\xdc\x4e\xdb\xf9\xe5\xd9\xf9\xe5\xd9\x6c\xba\xb8\xbe\xfa\xf8\x53\xf2\x7a\x7a\x3a\xac\xac\x07\x0b\xbc\x20\x75\xee\xb4\x75\x19\x20\xce\x1d\x96\xe1\x85\x8c\x49\xa9\x1f\xa8\x61\x6e\x69\xe7\x31\x33\x22\x5e\x27\x71\x7d\xac\x7d\x15\xfc\x5a\x20\x53\x39\x8c\x91\x14\xd7\x08\xda\x76\x73\xc0\x5f\x48\xde\xb4\xee\x23\x4d\x4a\x77\x40\xc7\x30\xd5\xac\x57\x1f\x0e\x14\x53\xbc\xfa\xc6\x56\x2d\x7d\x63\x0e\x7e\x5a\xe7\xb0\xd4\x10\xa9\x08\x35\x4c\x2b\x4f\xb0\xc5\x93\xc4\x12\x3e\x85\x34\x2f\x19\xbb\xe3\xd4\x33\x19\xe7\x2f\xd7\x8d\xc8\x3e\xe5\x92\x5e\xca\x75\x51\x5f\x60\xba\xbc\x88\xbd\x5f\x7f\x63\xef\x6f\xec\xdd\x63\x6f\x2c\x25\xd8\x5f\x81\xa9\x69\xa8\xf8\x00\xbe\x7e\x3d\xc6\xd7\x1d\x55\x5f\x4e\x19\x7e\xe5\xac\x1d\xf8\xd5\xa0\xd0\x28\x5c\x75\x2e\x99\xb5\x9f\x1b\x25\x95\x75\x50\xd0\xcd\x2b\x23\xe5\x28\x9c\xd8\x3f\x34\x6e\x6e\x55\x67\xcd\xad\xea\xf3\xf0\xff\x68\x75\x7c\xfb\x03\x32\x0e\xd7\x80\x42\x67\x37\xc0\xb5\xca\x6c\x4a\x92\xd9\x36\x93\x1a\x67\xb6\xde\xd6\x0f\xf5\x4f\x83\x68\x87\xbe\x19\x19\x5a\x54\xf0\x14\x72\xf4\x91\xfc\x28\x4b\x03\x1a\x0e\x31\xd9\x3b\xde\xbf\xc0\x68\xef\xb4\x7f\x7c\x33\x3f\xd2\xee\xd8\x89\xe0\xa5\xf9\xf8\xff\x99\xdf\xa8\xfa\x5f\x00\x00\x00\xff\xff\xe6\x12\x84\x63\x4e\x1e\x00\x00") func assetsThanosQuerierDeploymentYamlBytes() ([]byte, error) { return bindataRead( @@ -2723,7 +2723,7 @@ func assetsThanosQuerierDeploymentYaml() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "assets/thanos-querier/deployment.yaml", size: 7785, mode: os.FileMode(420), modTime: time.Unix(1, 0)} + info := bindataFileInfo{name: "assets/thanos-querier/deployment.yaml", size: 7758, mode: os.FileMode(420), modTime: time.Unix(1, 0)} a := &asset{bytes: bytes, info: info} return a, nil } diff --git a/pkg/manifests/config.go b/pkg/manifests/config.go index 24010325a4..081c7605fa 100644 --- a/pkg/manifests/config.go +++ b/pkg/manifests/config.go @@ -114,6 +114,7 @@ type ThanosRulerConfig struct { } type ThanosQuerierConfig struct { + LogLevel string `json:"logLevel"` NodeSelector map[string]string `json:"nodeSelector"` Tolerations []v1.Toleration `json:"tolerations"` Resources *v1.ResourceRequirements `json:"resources"` @@ -428,6 +429,8 @@ func (c *Config) IsUserWorkloadEnabled() bool { // and depracted from 4.7 onwards. // Instead warn user in the logs. func (c *UserWorkloadConfig) isEnabled() bool { - klog.Warning("DEPRECATED: Migrate to new user workload monitoring configuration, this tech preview was removed.") + if c.Enabled != nil { + klog.Warning("DEPRECATED: Migrate to new user workload monitoring configuration, this tech preview was removed.") + } return false } diff --git a/pkg/manifests/manifests.go b/pkg/manifests/manifests.go index 7842d44d6f..3c4b61e016 100644 --- a/pkg/manifests/manifests.go +++ b/pkg/manifests/manifests.go @@ -2645,6 +2645,9 @@ func (f *Factory) ThanosQuerierDeployment(grpcTLS *v1.Secret, enableUserWorkload if f.config.ClusterMonitoringConfiguration.ThanosQuerierConfig.Resources != nil { d.Spec.Template.Spec.Containers[i].Resources = *f.config.ClusterMonitoringConfiguration.ThanosQuerierConfig.Resources } + if f.config.ClusterMonitoringConfiguration.ThanosQuerierConfig.LogLevel != "" { + d.Spec.Template.Spec.Containers[i].Args = append(d.Spec.Template.Spec.Containers[i].Args, fmt.Sprintf("--log.level=%s", f.config.ClusterMonitoringConfiguration.ThanosQuerierConfig.LogLevel)) + } case "prom-label-proxy": d.Spec.Template.Spec.Containers[i].Image = f.config.Images.PromLabelProxy