removed headers for loki output

Author: AndrewChubatiuk

api/observability/v1/output_types.go

@@ -995,12 +995,6 @@ type Loki struct {
 	// +kubebuilder:validation:Pattern:=`^(([a-zA-Z0-9-_.\/])*(\{(\.[a-zA-Z0-9_]+|\."[^"]+")+((\|\|)(\.[a-zA-Z0-9_]+|\.?"[^"]+")+)*\|\|"[^"]*"\})*)*$`
 	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Tenant Key",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:text"}
 	TenantKey string `json:"tenantKey,omitempty"`
-
-	// Headers specify optional headers to be sent with the request
-	//
-	// +kubebuilder:validation:Optional
-	// +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Headers"
-	Headers map[string]string `json:"headers,omitempty"`
 }
 
 type SplunkTuningSpec struct {

api/observability/v1/zz_generated.deepcopy.go

@@ -2679,12 +2679,6 @@ spec:
                               - secretName
                               type: object
                           type: object
-                        headers:
-                          additionalProperties:
-                            type: string
-                          description: Headers specify optional headers to be sent
-                            with the request
-                          type: object
                         labelKeys:
                           description: |-
                             LabelKeys can be used to customize which log record keys are mapped to Loki stream labels.

config/crd/bases/observability.openshift.io_clusterlogforwarders.yaml

@@ -2587,8 +2587,6 @@ The 'username@password' part of `url` is ignored.
 
 |authentication|object|  Authentication sets credentials for authenticating the requests.
 
-|headers|object|  Headers specify optional headers to be sent with the request
-
 |labelKeys|array|  LabelKeys can be used to customize which log record keys are mapped to Loki stream labels.
 
 If LabelKeys is not set, the default keys are:
@@ -2724,10 +2722,6 @@ Type:: object
 
 |======================
 
-=== .spec.outputs[].loki.headers
-
-Type:: object
-
 === .spec.outputs[].loki.labelKeys[]
 
 Type:: array

docs/reference/operator/api_observability_v1.adoc

@@ -172,7 +172,7 @@ func New(id string, o obs.OutputSpec, inputs []string, secrets observability.Sec
 		common.NewAcknowledgments(id, strategy),
 		common.NewBatch(id, strategy),
 		common.NewBuffer(id, strategy),
-		Request(id, o.Loki, strategy),
+		common.NewRequest(id, strategy),
 		NewLabels(id, o),
 		tls.New(id, o.TLS, secrets, op),
 		auth.HTTPAuth(id, o.Loki.Authentication, secrets, op),
@@ -313,11 +313,3 @@ func CleanupFields(id string, inputs []string) Element {
 		VRL:         "del(.tag)",
 	}
 }
-
-func Request(id string, o *obs.Loki, strategy common.ConfigStrategy) *common.Request {
-	req := common.NewRequest(id, strategy)
-	if len(o.Headers) != 0 {
-		req.SetHeaders(o.Headers)
-	}
-	return req
-}

internal/generator/vector/output/loki/loki.go

@@ -193,10 +193,5 @@ var _ = Describe("Generate vector config", func() {
 				BaseOutputTuningSpec: *baseTune,
 			}
 		}),
-		Entry("with headers", "with_headers.toml", framework.NoOptions, true, func(spec *obs.OutputSpec) {
-                        spec.Loki.Headers = map[string]string{
-				"header": "value",
-                        }
-                }),
 	)
 })