checked out specific files to match upstream

CHANGELOG.md

@@ -8,16 +8,7 @@ NOTE: As semantic versioning states all 0.y.z releases can contain breaking chan
 
 We use *breaking :warning:* to mark changes that are not backward compatible (relates only to v0.y.z releases.)
 
-## [v0.29.0](https://github.com/thanos-io/thanos/tree/release-0.29) - 2022.11.03
-
-### Fixed
-- [#5642](https://github.com/thanos-io/thanos/pull/5642) Receive: Log labels correctly in writer debug messages.
-- [#5655](https://github.com/thanos-io/thanos/pull/5655) Receive: Fix recreating already pruned tenants.
-- [#5702](https://github.com/thanos-io/thanos/pull/5702) Store: Upgrade minio-go/v7 to fix panic caused by leaked goroutines.
-- [#5736](https://github.com/thanos-io/thanos/pull/5736) Compact: Fix crash in GatherNoCompactionMarkFilter.NoCompactMarkedBlocks.
-- [#5763](https://github.com/thanos-io/thanos/pull/5763) Compact: Enable metadata cache.
-- [#5759](https://github.com/thanos-io/thanos/pull/5759) Compact: Fix missing duration log key.
-- [#5799](https://github.com/thanos-io/thanos/pull/5799) Query Frontend: Fixed sharding behaviour for vector matches. Now queries with sharding should work properly where the query looks like: `foo and without (lbl) bar`.
+## Unreleased
 
 ## [v0.30.0](https://github.com/thanos-io/thanos/tree/release-0.30) - 2.01.2023
 

cmd/thanos/query.go

@@ -98,8 +98,6 @@ func registerQuery(app *extkingpin.App) {
 
 	queryTimeout := extkingpin.ModelDuration(cmd.Flag("query.timeout", "Maximum time to process query by query node.").
 		Default("2m"))
-	promqlEngine := cmd.Flag("query.promql-engine", "PromQL engine to use.").Default(string(promqlEnginePrometheus)).Hidden().
-		Enum(string(promqlEnginePrometheus), string(promqlEngineThanos))
 
 	promqlEngine := cmd.Flag("query.promql-engine", "PromQL engine to use.").Default(string(promqlEnginePrometheus)).
 		Enum(string(promqlEnginePrometheus), string(promqlEngineThanos))

docs/storage.md

@@ -600,72 +600,6 @@ Allow group thanos to read buckets in compartment id ocid1.compartment.oc1..a
 Allow group thanos to manage objects in compartment id ocid1.compartment.oc1..a
 ```
 
-### Oracle Cloud Infrastructure Object Storage
-
-To configure Oracle Cloud Infrastructure (OCI) Object Storage as Thanos Object Store, you need to provide appropriate authentication credentials to your OCI tenancy. The OCI object storage client implementation for Thanos supports either the default keypair or instance principal authentication.
-
-#### API Signing Key
-
-The default API signing key authentication provider leverages same [configuration as the OCI CLI](https://docs.oracle.com/en-us/iaas/Content/API/Concepts/cliconcepts.htm) which is usually stored in at `$HOME/.oci/config` or via variable names starting with the string `OCI_CLI`. If the same configuration is found in multiple places the provider will prefer the first one.
-
-The following example configures the provider to look for an existing API signing key for authentication:
-
-```yaml
-type: OCI
-config:
-  provider: "default"
-  bucket: ""
-  compartment_ocid: ""
-  part_size: ""                   // Optional part size to override the OCI default of 128 MiB, value is in bytes.
-  max_request_retries: ""         // Optional maximum number of retries for a request.
-  request_retry_interval: ""      // Optional sleep duration in seconds between retry requests.
-  http_config:
-    idle_conn_timeout: 1m30s      // Optional maximum amount of time an idle (keep-alive) connection will remain idle before closing itself. Zero means no limit.
-    response_header_timeout: 2m   // Optional amount of time to wait for a server's response headers after fully writing the request.
-    tls_handshake_timeout: 10s    // Optional maximum amount of time waiting to wait for a TLS handshake. Zero means no timeout.
-    expect_continue_timeout: 1s   // Optional amount of time to wait for a server's first response headers. Zero means no timeout and causes the body to be sent immediately.
-    insecure_skip_verify: false   // Optional. If true, crypto/tls accepts any certificate presented by the server and any host name in that certificate.
-    max_idle_conns: 100           // Optional maximum number of idle (keep-alive) connections across all hosts. Zero means no limit.
-    max_idle_conns_per_host: 100  // Optional maximum idle (keep-alive) connections to keep per-host. If zero, DefaultMaxIdleConnsPerHost=2 is used.
-    max_conns_per_host: 0         // Optional maximum total number of connections per host.
-    disable_compression: false    // Optional. If true, prevents the Transport from requesting compression.
-    client_timeout: 90s           // Optional time limit for requests made by the HTTP Client.
-```
-
-#### Instance Principal Provider
-
-For Example:
-
-```yaml
-type: OCI
-config:
-  provider: "instance-principal"
-  bucket: ""
-  compartment_ocid: ""
-```
-
-You can also include any of the optional configuration just like the example in `Default Provider`.
-
-#### Raw Provider
-
-For Example:
-
-```yaml
-type: OCI
-config:
-  provider: "raw"
-  bucket: ""
-  compartment_ocid: ""
-  tenancy_ocid: ""
-  user_ocid: ""
-  region: ""
-  fingerprint: ""
-  privatekey: ""
-  passphrase: ""         // Optional passphrase to encrypt the private API Signing key
-```
-
-You can also include any of the optional configuration just like the example in `Default Provider`.
-
 ### How to add a new client to Thanos?
 
 objstore.go

pkg/receive/handler.go

@@ -31,9 +31,6 @@ import (
 	"github.com/prometheus/prometheus/model/relabel"
 	"github.com/prometheus/prometheus/storage"
 	"github.com/prometheus/prometheus/tsdb"
-	"github.com/thanos-io/thanos/pkg/api"
-	statusapi "github.com/thanos-io/thanos/pkg/api/status"
-	"github.com/thanos-io/thanos/pkg/logging"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

pkg/replicate/scheme_test.go

@@ -35,13 +35,6 @@ var (
 	maxTimeDuration = model.TimeOrDurationValue{Time: &maxTime}
 )
 
-var (
-	minTime         = time.Unix(0, 0)
-	maxTime, _      = time.Parse(time.RFC3339, "9999-12-31T23:59:59Z")
-	minTimeDuration = model.TimeOrDurationValue{Time: &minTime}
-	maxTimeDuration = model.TimeOrDurationValue{Time: &maxTime}
-)
-
 func testLogger(testName string) log.Logger {
 	return log.With(
 		level.NewFilter(log.NewLogfmtLogger(log.NewSyncWriter(os.Stderr)), level.AllowDebug()),