Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
1f02f2e
QuickWit-local-file
tvangundy Mar 30, 2025
0f6fc06
minio support
tvangundy Mar 31, 2025
3e1af41
merge main in
hernan82arg Jun 19, 2025
8020cee
Merge branch 'main' into quickwit
hernan82arg Jun 19, 2025
3e75d0e
Merge branch 'main' into quickwit
hernan82arg Jul 3, 2025
962b649
quickwit changes
hernan82arg Jul 7, 2025
328aef5
Merge branch 'main' into quickwit
hernan82arg Jul 8, 2025
893d915
Merge branch 'main' into quickwit
hernan82arg Jul 9, 2025
559e5f8
quickwit changes
hernan82arg Jul 9, 2025
39e0b07
Adds index and cluster output for fluentbit
hernan82arg Jul 9, 2025
97ceeb2
adds fluentd as aggregator
hernan82arg Jul 10, 2025
e83f386
fix blueprint
hernan82arg Jul 14, 2025
65b9338
fixes
hernan82arg Jul 14, 2025
26bffe9
test
hernan82arg Jul 23, 2025
c9041ad
fixes
hernan82arg Jul 23, 2025
86c00d6
test
hernan82arg Jul 23, 2025
733b151
cleaning up
hernan82arg Jul 23, 2025
26dade6
Merge branch 'main' into quickwit
hernan82arg Jul 24, 2025
cfb5940
remove context
hernan82arg Jul 24, 2025
24721dc
quickwit: remove minio
hernan82arg Jul 24, 2025
4521434
Merge branch 'main' into quickwit
hernan82arg Jul 24, 2025
89388e9
fix blueprint
hernan82arg Jul 24, 2025
2895977
Add fluentbit and fluentd in to blueprint.jsonnet
rmvangun Jul 24, 2025
f307faa
Merge branch 'main' into quickwit
rmvangun Jul 24, 2025
aa6d1f0
Ignore all contexts other than _template
rmvangun Jul 24, 2025
1ba5672
fix(coredns): Prevent loop when forwarding to self-hosted dns (#706)
rmvangun Jul 24, 2025
a4996d9
Cleanup
rmvangun Jul 24, 2025
f2afcdb
Accept all incoming logs
rmvangun Jul 25, 2025
66a52a8
Create sub-component folders
rmvangun Jul 25, 2025
3498b55
Merge branch 'main' into quickwit
rmvangun Jul 25, 2025
52cc319
Remove README
rmvangun Jul 25, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Core Terraform modules and Kubernetes configurations used by [Windsor CLI](https://github.com/windsorcli/cli) to provision and manage infrastructure across multiple cloud providers.

![CI Workflow](https://github.com/your-repo/core/actions/workflows/ci.yaml/badge.svg)

## Contributing

This project uses several tools to maintain code quality and consistency:
Expand Down
3 changes: 3 additions & 0 deletions contexts/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
# Ignore all directories in contexts/
*/
# But allow _template directory
!/_template/
21 changes: 18 additions & 3 deletions contexts/_template/blueprint.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,17 @@ local kustomizeConfigs = {
],
components: [
"fluentd",
"fluentd/filters/otel",
"fluentd/outputs/quickwit",
"quickwit",
"quickwit/pvc",
"grafana",
"grafana/ingress",
"grafana/prometheus",
"grafana/node",
"grafana/kubernetes",
"grafana/flux"
"grafana/flux",
"grafana/quickwit"
],
}
],
Expand Down Expand Up @@ -277,12 +282,17 @@ local kustomizeConfigs = {
],
components: [
"fluentd",
"fluentd/filters/otel",
"fluentd/outputs/quickwit",
"quickwit",
"quickwit/pvc",
"grafana",
"grafana/ingress",
"grafana/prometheus",
"grafana/node",
"grafana/kubernetes",
"grafana/flux"
"grafana/flux",
"grafana/quickwit"
],
}
],
Expand Down Expand Up @@ -442,12 +452,17 @@ local kustomizeConfigs = {
],
components: [
"fluentd",
"fluentd/filters/otel",
"fluentd/outputs/quickwit",
"quickwit",
"quickwit/pvc",
"grafana",
"grafana/ingress",
"grafana/prometheus",
"grafana/node",
"grafana/kubernetes",
"grafana/flux"
"grafana/flux",
"grafana/quickwit"
],
}
]
Expand Down
2 changes: 0 additions & 2 deletions kustomize/observability/base/kustomization.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions kustomize/observability/base/namespace.yaml

This file was deleted.

22 changes: 22 additions & 0 deletions kustomize/observability/fluentd/filters/otel/clusterfilter.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
apiVersion: fluentd.fluent.io/v1alpha1
kind: ClusterFilter
metadata:
name: otel
labels:
filter.fluentd.fluent.io/enabled: "true"
spec:
filters:
- recordTransformer:
enableRuby: true
renewRecord: false
removeKeys: "logtag,time,log,kubernetes"
records:
- key: timestamp_nanos
value: |
$${Time.parse(record["time"]).to_i * 1_000_000_000 + Time.parse(record["time"]).nsec}
- key: body
value: |
$${{"message" => record["log"]}}
- key: resource_attributes
value: |
$${{"pod_name" => record["kubernetes"]["pod_name"], "namespace_name" => record["kubernetes"]["namespace_name"], "container_name" => record["kubernetes"]["container_name"], "container_image_id" => record["kubernetes"]["docker_id"], "container_image" => record["kubernetes"]["container_image"]}}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component
resources:
- clusterfilter.yaml
16 changes: 2 additions & 14 deletions kustomize/observability/fluentd/fluentd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@ spec:
- forward:
bind: 0.0.0.0
port: 24224
image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.0
logLevel: info
mode: collector
positionDB: {}
# renovate: datasource=docker depName=ghcr.io/fluent/fluent-operator/fluentd package=ghcr.io/fluent/fluent-operator/fluentd
image: ghcr.io/fluent/fluent-operator/fluentd:v1.17.1
replicas: 1
resources:
limits:
Expand All @@ -25,10 +23,6 @@ spec:
requests:
cpu: 100m
memory: 128Mi
service: {}
status:
messages: all matched cfgs is valid
state: active
---
apiVersion: fluentd.fluent.io/v1alpha1
kind: ClusterFluentdConfig
Expand All @@ -43,9 +37,3 @@ spec:
clusterOutputSelector:
matchLabels:
output.fluentd.fluent.io/enabled: "true"
watchedNamespaces:
- kube-system
- default
status:
messages: Generate fluentd configs successfully
state: valid
2 changes: 1 addition & 1 deletion kustomize/observability/fluentd/helm-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
chart: charts/fluent-operator
# chart: fluent-operator
# renovate: datasource=helm depName=fluent-operator package=fluent-operator helmRepo=https://fluent.github.io/helm-charts
# version: 3.4.2
version: 3.4.2
sourceRef:
kind: GitRepository
name: fluent-operator
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: fluentd.fluent.io/v1alpha1
kind: ClusterOutput
metadata:
name: quickwit
labels:
output.fluentd.fluent.io/enabled: "true"
spec:
outputs:
- http:
endpoint: http://quickwit-indexer.system-observability.svc.cluster.local:7280/api/v1/otel-logs-v0_7/ingest
contentType: application/json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component
resources:
- clusteroutput.yaml
11 changes: 11 additions & 0 deletions kustomize/observability/grafana/quickwit/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component
patches:
- path: patches/helm-release.yaml
- target:
group: helm.toolkit.fluxcd.io
version: v2
kind: HelmRelease
name: grafana
namespace: system-observability
path: patches/patch.json
12 changes: 12 additions & 0 deletions kustomize/observability/grafana/quickwit/patches/helm-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: grafana
namespace: system-observability
spec:
dependsOn:
- name: quickwit
namespace: system-observability
values:
plugins:
- quickwit-quickwit-datasource
15 changes: 15 additions & 0 deletions kustomize/observability/grafana/quickwit/patches/patch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[
{
"op": "add",
"path": "/spec/values/datasources/datasources.yaml/datasources/-",
"value": {
"name": "Quickwit Logs",
"uid": "quickwit-logs",
"type": "quickwit-quickwit-datasource",
"url": "http://quickwit-searcher.system-observability.svc.cluster.local:7280/api/v1",
"jsonData": {
"index": "otel-logs-v0_7"
}
}
}
]
21 changes: 21 additions & 0 deletions kustomize/observability/quickwit/helm-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: quickwit
namespace: system-observability
spec:
interval: 5m
timeout: 10m
chart:
spec:
chart: quickwit
# renovate: datasource=helm depName=quickwit package=quickwit helmRepo=https://helm.quickwit.io
version: 0.7.17
sourceRef:
kind: HelmRepository
name: quickwit
namespace: system-gitops
values:
searcher:
replicaCount: 1
10 changes: 10 additions & 0 deletions kustomize/observability/quickwit/helm-repository.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
apiVersion: source.toolkit.fluxcd.io/v1beta1
kind: HelmRepository
metadata:
name: quickwit
namespace: system-gitops
spec:
interval: 10m
timeout: 3m
url: https://helm.quickwit.io
5 changes: 5 additions & 0 deletions kustomize/observability/quickwit/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component
resources:
- helm-repository.yaml
- helm-release.yaml
6 changes: 6 additions & 0 deletions kustomize/observability/quickwit/pvc/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component
resources:
- volume.yaml
patches:
- path: patches/helm-release.yaml
44 changes: 44 additions & 0 deletions kustomize/observability/quickwit/pvc/patches/helm-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
---
# SECURITY NOTE: This approach uses a hostPath volume to store the indexes on the host machine.
# It also requires elevated privileges. Do not use in production. For a more secure setup,
# integrate with backing services such as Postgres, Minio, or S3.
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: quickwit
namespace: system-observability
spec:
values:
environment:
QW_METASTORE_URI: file:///quickwit/qwdata/indexes
config:
default_index_root_uri: file:///quickwit/qwdata/indexes
podSecurityContext:
runAsNonRoot: false
runAsUser: 0
runAsGroup: 0
allowPrivilegeEscalation: true
securityContext:
runAsNonRoot: false
runAsUser: 0
runAsGroup: 0
allowPrivilegeEscalation: true
searcher:
replicaCount: 1
extraVolumes:
- name: quickwit-indexes
persistentVolumeClaim:
claimName: quickwit-indexes
extraVolumeMounts:
- name: quickwit-indexes
mountPath: /quickwit/qwdata/indexes
readOnly: true
indexer:
extraVolumes:
- name: quickwit-indexes
persistentVolumeClaim:
claimName: quickwit-indexes
extraVolumeMounts:
- name: quickwit-indexes
mountPath: /quickwit/qwdata/indexes
readOnly: false
11 changes: 11 additions & 0 deletions kustomize/observability/quickwit/pvc/volume.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: quickwit-indexes
namespace: system-observability
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 10Gi
Loading