Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
Loki
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Loki
Commits
067c5aff
Commit
067c5aff
authored
6 years ago
by
Steven Sheehy
Committed by
Ed
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Add entryParser option to helm chart
Signed-off-by:
Steven Sheehy
<
ssheehy@firescope.com
>
parent
73184a33
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
production/helm/Chart.yaml
+2
-2
2 additions, 2 deletions
production/helm/Chart.yaml
production/helm/templates/promtail/configmap.yaml
+3
-1
3 additions, 1 deletion
production/helm/templates/promtail/configmap.yaml
production/helm/values.yaml
+2
-0
2 additions, 0 deletions
production/helm/values.yaml
with
7 additions
and
3 deletions
production/helm/Chart.yaml
+
2
−
2
View file @
067c5aff
name
:
loki
version
:
0.
0.1
version
:
0.
1.0
appVersion
:
0.0.1
kubeVersion
:
"
^1.10.0-0"
description
:
"
Loki:
like
Prometheus,
but
for
logs."
...
...
@@ -10,4 +10,4 @@ sources:
maintainers
:
-
name
:
Loki Maintainers
email
:
lokiproject@googlegroups.com
engine
:
gotpl
\ No newline at end of file
engine
:
gotpl
This diff is collapsed.
Click to expand it.
production/helm/templates/promtail/configmap.yaml
+
3
−
1
View file @
067c5aff
...
...
@@ -11,6 +11,7 @@ data:
promtail.yaml
:
|
scrape_configs:
- job_name: kubernetes-pods
entry_parser: {{ .Values.promtail.entryParser }}
kubernetes_sd_configs:
- role: pod
relabel_configs:
...
...
@@ -49,6 +50,7 @@ data:
- __meta_kubernetes_pod_container_name
target_label: __path__
- job_name: kubernetes-pods-app
entry_parser: {{ .Values.promtail.entryParser }}
kubernetes_sd_configs:
- role: pod
relabel_configs:
...
...
@@ -89,4 +91,4 @@ data:
source_labels:
- __meta_kubernetes_pod_uid
- __meta_kubernetes_pod_container_name
target_label: __path__
\ No newline at end of file
target_label: __path__
This diff is collapsed.
Click to expand it.
production/helm/values.yaml
+
2
−
0
View file @
067c5aff
...
...
@@ -97,6 +97,8 @@ promtail:
nameOverride
:
promtail
deploymentStrategy
:
RollingUpdate
entryParser
:
docker
image
:
repository
:
grafana/promtail
tag
:
master
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment