Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add service and service monitor for forwarder #1546

Merged
merged 20 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d158d93
Added holmes_conversation action
itisallgood Aug 27, 2024
96a869c
Merge remote-tracking branch 'origin/master' into chat-input-box
itisallgood Aug 27, 2024
bb60372
Updated comment for HolmesConversationIssueContext
itisallgood Aug 27, 2024
1952702
Updated lightActions
itisallgood Aug 28, 2024
6b24ab7
Added HolmesToolsResult to verify tools input
itisallgood Aug 28, 2024
d85c101
Updated HolmesConversationRequest model
itisallgood Aug 29, 2024
3265c4f
Added getting holmes model in ActivityStats
itisallgood Aug 30, 2024
8c6ac66
Merge branch 'master' into chat-input-box
itisallgood Aug 30, 2024
0c83bc7
Made parameters optional for HolmesConversationIssueContext
itisallgood Aug 30, 2024
39e2791
Made some parameters for conversation api optional
itisallgood Aug 30, 2024
f6b79a5
Removed logging the error from get_holmes_model and fixed a bug
itisallgood Aug 30, 2024
924e65a
Merge remote-tracking branch 'origin/master' into chat-input-box
itisallgood Sep 5, 2024
48b9e0a
Added service and service monitor for forwarder
itisallgood Sep 9, 2024
58debbd
Merge branch 'master' into add-service-and-service-monitor-for-forwarder
itisallgood Sep 9, 2024
b1e0bb6
Merge branch 'master' into add-service-and-service-monitor-for-forwarder
itisallgood Sep 9, 2024
90962fe
Updated values.yaml
itisallgood Sep 9, 2024
4986899
Merge branch 'add-service-and-service-monitor-for-forwarder' of githu…
itisallgood Sep 9, 2024
8d713f6
Merge branch 'master' into add-service-and-service-monitor-for-forwarder
itisallgood Sep 20, 2024
2a3833c
Left only default values in forwarder.yaml
itisallgood Sep 20, 2024
236d293
Merge branch 'add-service-and-service-monitor-for-forwarder' of githu…
itisallgood Sep 20, 2024
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
54 changes: 53 additions & 1 deletion helm/robusta/templates/forwarder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,56 @@ spec:
{{- if .Values.kubewatch.priorityClassName }}
priorityClassName: {{ .Values.kubewatch.priorityClassName }}
{{- end }}

---
apiVersion: v1
kind: Service
metadata:
name: {{ include "robusta.fullname" . }}-forwarder
namespace: {{ .Release.Namespace }}
labels:
app: {{ include "robusta.fullname" . }}-forwarder
spec:
selector:
app: {{ include "robusta.fullname" . }}-forwarder
ports:
- name: forwarder-metrics
protocol: TCP
itisallgood marked this conversation as resolved.
Show resolved Hide resolved
port: {{ default 2112 .Values.kubewatch.service.port }}
itisallgood marked this conversation as resolved.
Show resolved Hide resolved
targetPort: {{ default 2112 .Values.kubewatch.service.port }}
---
{{ if and (.Values.enableServiceMonitors) (or (.Values.enablePrometheusStack) (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1/ServiceMonitor") ) }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "robusta.fullname" . }}-forwarder-service-monitor
labels:
release: {{ include "robusta.fullname" . }}
{{- with .Values.kubewatch.serviceMonitor.additionalLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
endpoints:
- path: {{ .Values.kubewatch.serviceMonitor.path }}
port: forwarder-metrics
{{- if .Values.kubewatch.serviceMonitor.interval }}
interval: {{ .Values.kubewatch.serviceMonitor.interval }}
{{- end }}
{{- if .Values.kubewatch.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.kubewatch.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- if .Values.kubewatch.serviceMonitor.relabelings }}
relabelings: {{- tpl (toYaml .Values.kubewatch.serviceMonitor.relabelings) . | nindent 8 }}
{{- end }}
{{- if .Values.kubewatch.serviceMonitor.metricRelabelings }}
metricRelabelings: {{- tpl (toYaml .Values.kubewatch.serviceMonitor.metricRelabelings) . | nindent 8 }}
{{- end }}
{{- if .Values.kubewatch.serviceMonitor.honorLabels }}
honorLabels: {{ .Values.kubewatch.serviceMonitor.honorLabels }}
{{- end }}
selector:
matchLabels:
app: {{ include "robusta.fullname" . }}-forwarder
targetLabels:
- target
{{ end }}
---
7 changes: 6 additions & 1 deletion helm/robusta/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ image:

# parameters for the robusta forwarder deployment
kubewatch:
image: ~ # image can be used to override image.registry/imageName
image: ~ # image can be used to override image.registry/imageName
imageName: kubewatch:v2.7.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we need a new Kubewatch image?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to change it after new kubewatch release

imagePullPolicy: IfNotPresent
pprof: True
Expand Down Expand Up @@ -634,6 +634,11 @@ kubewatch:
runAsUser: 1000
pod: {}
customServiceAccount: "" # to override the kubewatch service account
service:
port: 2112
serviceMonitor:
path: /metrics
interval: 15s
itisallgood marked this conversation as resolved.
Show resolved Hide resolved
serviceAccount:
# Additional annotations for the ServiceAccount.
annotations: {}
Expand Down
Loading