Skip to content

Commit

Permalink
Update endpoints (#333)
Browse files Browse the repository at this point in the history
* Update README.md

* Update values.yaml

* Update fluentbit-cm.yaml

* Update fluent.conf

* Update fluent.conf

* Update firelens.conf

* Update fluent.conf

* Update values.yaml

* Update fluentd-cm.yaml

* Update CHANGELOG.md

* DOCS - Add fluentbit changes to CHANGELOG.md

---------

Co-authored-by: Michael Briggs <[email protected]>
  • Loading branch information
royfur and MichaelBriggs-Coralogix authored Nov 27, 2023
1 parent a49e56d commit c6eb1b1
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 21 deletions.
8 changes: 8 additions & 0 deletions logs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Fluentd

### v1.16.3 / 2023-11-23

* [CHANGE] Update the coralogix API

### v1.16.3 / 2023-11-22

* [UPGRADE] Upgrade Fluentd version to v1.16.3
Expand Down Expand Up @@ -37,6 +41,10 @@

## Fluent-Bit

### v2.2.0 / 2023-11-23

* [CHANGE] Update the coralogix API

### v2.2.0 / 2023-11-22

* [UPGRADE] Upgrade Fluentbit version to v2.2.0
Expand Down
4 changes: 2 additions & 2 deletions logs/fluent-bit/ecs-fargate/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,13 @@ To do so, you'd add this "logConfiguration" section to each of your application
"logDriver": "awsfirelens",
"options": {
"Format": "json_lines",
"Header": "private_key <Coralogix PrivateKey>",
"Header": "Authorization Bearer <Coralogix APIKey>",
"Host": "ingress.<Coralogix Domain>",
"Name": "http",
"Port": "443",
"Retry_Limit": "10",
"TLS": "On",
"URI": "/logs/rest/singles",
"URI": "/logs/v1/singles",
"compress": "gzip"
}
}
Expand Down
10 changes: 5 additions & 5 deletions logs/fluent-bit/k8s-helm/http/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,10 @@ fluent-bit:
Match kube.*
Host ${ENDPOINT}
Port 443
URI /logs/rest/singles
URI /logs/v1/singles
Format json_lines
TLS On
Header private_key ${PRIVATE_KEY}
Header Authorization Bearer ${PRIVATE_KEY}
compress gzip
Retry_Limit False
net.keepalive off
Expand Down Expand Up @@ -211,10 +211,10 @@ fluent-bit:
Match host.*
Host ${ENDPOINT}
Port 443
URI /logs/rest/singles
URI /logs/v1/singles
Format json_lines
TLS On
Header private_key ${PRIVATE_KEY}
Header Authorization Bearer ${PRIVATE_KEY}
compress gzip
Retry_Limit False
net.keepalive off
Expand All @@ -234,4 +234,4 @@ dynamic_metadata:
sub_system: kubernetes.container_name
static_metadata:
app_name: ""
sub_system: ""
sub_system: ""
10 changes: 5 additions & 5 deletions logs/fluent-bit/k8s-manifest/fluentbit-cm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ data:
Match kube.*
Host ${ENDPOINT}
Port 443
URI /logs/rest/singles
URI /logs/v1/singles
Format json_lines
TLS On
Header private_key ${PRIVATE_KEY}
Header Authorization Bearer ${PRIVATE_KEY}
compress gzip
Retry_Limit False
net.keepalive off
Expand Down Expand Up @@ -121,10 +121,10 @@ data:
Match host.*
Host ${ENDPOINT}
Port 443
URI /logs/rest/singles
URI /logs/v1/singles
Format json_lines
TLS On
Header private_key ${PRIVATE_KEY}
Header Authorization Bearer ${PRIVATE_KEY}
compress gzip
Retry_Limit False
net.keepalive off
Expand Down Expand Up @@ -168,4 +168,4 @@ data:
local processed_fraction = string.format("%09d", timestamp['nsec'])
new_record["timestamp"] = string.format("%s%s", timestamp['sec'], string.sub(processed_fraction, 1, -4))
return RETURN_WITHOUT_MODIFYING_TIMESTAMP, timestamp, new_record
end
end
4 changes: 2 additions & 2 deletions logs/fluentd/aws-ecs/image/firelens.conf
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
</filter>
<match **>
@type http
endpoint "https://#{ENV['ENDPOINT']}/logs/rest/singles"
headers_from_placeholders {"private_key":"${$.privateKey}"}
endpoint "https://#{ENV['ENDPOINT']}/logs/v1/singles"
headers_from_placeholders {"Authorization":"Bearer ${$.privateKey}"}
error_response_as_unrecoverable false
retryable_response_codes 503
<buffer $.privateKey>
Expand Down
6 changes: 3 additions & 3 deletions logs/fluentd/aws-ecs/image/fluent.conf
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@

<match **>
@type http
endpoint "https://#{ENV['ENDPOINT']}/logs/rest/singles"
headers_from_placeholders {"private_key":"${$.privateKey}"}
endpoint "https://#{ENV['ENDPOINT']}/logs/v1/singles"
headers_from_placeholders {"Authorization":"Bearer ${$.privateKey}"}
error_response_as_unrecoverable false
retryable_response_codes 503
<buffer $.privateKey>
Expand All @@ -82,4 +82,4 @@
retry_type periodic
retry_wait 8
</buffer>
</match>
</match>
4 changes: 2 additions & 2 deletions logs/fluentd/k8s-helm/http/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ fluentd:
<match **>
@type http
endpoint "https://#{ENV['ENDPOINT']}/logs/rest/singles"
headers_from_placeholders {"private_key":"${$.privateKey}"}
endpoint "https://#{ENV['ENDPOINT']}/logs/v1/singles"
headers_from_placeholders {"Authorization":"Bearer ${$.privateKey}"}
error_response_as_unrecoverable false
<buffer $.privateKey>
@type memory
Expand Down
4 changes: 2 additions & 2 deletions logs/fluentd/k8s-manifest/fluentd-cm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,8 @@ data:
<match **>
@type http
endpoint "https://#{ENV['ENDPOINT']}/logs/rest/singles"
headers_from_placeholders {"private_key":"${$.privateKey}"}
endpoint "https://#{ENV['ENDPOINT']}/logs/v1/singles"
headers_from_placeholders {"Authorization":"Bearer ${$.privateKey}"}
error_response_as_unrecoverable false
<buffer $.privateKey>
@type memory
Expand Down

0 comments on commit c6eb1b1

Please sign in to comment.