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

fix: add flower admin panel #1074

Merged
merged 1 commit into from
Dec 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions charts/splunk-connect-for-snmp/templates/worker/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ app.kubernetes.io/name: {{ include "splunk-connect-for-snmp.worker.name" . }}-tr
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}

{{- define "splunk-connect-for-snmp.worker.flower.selectorLabels" -}}
app.kubernetes.io/name: {{ include "splunk-connect-for-snmp.worker.name" . }}-flower
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end }}


{{/*
Common labels
Expand All @@ -78,6 +83,11 @@ Common labels
{{ include "splunk-connect-for-snmp.labels" . }}
{{- end }}

{{- define "splunk-connect-for-snmp.worker.flower.labels" -}}
{{ include "splunk-connect-for-snmp.worker.flower.selectorLabels" . }}
{{ include "splunk-connect-for-snmp.labels" . }}
{{- end }}

{{- define "environmental-variables" -}}
- name: CONFIG_PATH
value: /app/config/config.yaml
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{{- if .Values.flower.enabled }}
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "splunk-connect-for-snmp.worker.fullname" . }}-flower
labels:
{{- include "splunk-connect-for-snmp.worker.flower.labels" . | nindent 4 }}

spec:
replicas: 1
selector:
matchLabels:
{{- include "splunk-connect-for-snmp.worker.flower.selectorLabels" . | nindent 6 }}
template:
metadata:
labels:
{{- include "splunk-connect-for-snmp.worker.flower.selectorLabels" . | nindent 8 }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "splunk-connect-for-snmp.serviceAccountName" . }}
securityContext:
fsGroup: 10001
containers:
- name: {{ .Chart.Name }}-flower
securityContext:
capabilities:
drop:
- ALL
readOnlyRootFilesystem: true
runAsNonRoot: true
runAsUser: 10001
runAsGroup: 10001
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
args:
[
"celery", "flower",
]
env:
{{- include "environmental-variables" . | nindent 12 }}
ports:
- containerPort: 5555

volumeMounts:
- name: config
mountPath: "/app/config"
readOnly: true
- name: pysnmp-cache-volume
mountPath: "/.pysnmp/"
readOnly: false
- name: tmp
mountPath: "/tmp/"
readOnly: false
volumes:
- name: config
configMap:
name: {{ include "splunk-connect-for-snmp.name" . }}-config
items:
- key: "config.yaml"
path: "config.yaml"
- name: pysnmp-cache-volume
emptyDir: {}
- name: tmp
emptyDir: {}

{{- end }}
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{{- if .Values.flower.enabled }}
apiVersion: v1
kind: Service
metadata:
name: {{ include "splunk-connect-for-snmp.worker.fullname" . }}-flower
labels:
{{- include "splunk-connect-for-snmp.worker.flower.labels" . | nindent 4 }}


spec:
selector:
{{- include "splunk-connect-for-snmp.worker.flower.selectorLabels" . | nindent 4 }}
ports:
- protocol: TCP
port: {{ .Values.flower.port | default 80 }}
targetPort: 5555
type: LoadBalancer
{{- if .Values.flower.loadBalancerIP }}
externalIPs:
- {{ .Values.flower.loadBalancerIP }}
{{- end }}
{{- end }}
15 changes: 15 additions & 0 deletions charts/splunk-connect-for-snmp/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,21 @@
"pysnmpDebug": {
"type": "string"
},
"flower": {
"type": "object",
"additionalProperties": false,
"properties": {
"enabled": {
"type": "boolean"
},
"loadBalancerIP": {
"type": "string"
},
"port": {
"type": "integer"
}
}
},
"UI": {
"type": "object",
"additionalProperties": false,
Expand Down
5 changes: 5 additions & 0 deletions charts/splunk-connect-for-snmp/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ UI:
# valuesFileDirectory directory regardless of valuesFileName proper configuration.
keepSectionFiles: false

flower:
enabled: false
port: 80
loadBalancerIP: ''

################################################################################
# Splunk Cloud / Splunk Enterprise configuration.
################################################################################
Expand Down
2 changes: 2 additions & 0 deletions docker_compose/.env
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,6 @@ TRAP_LOG_LEVEL=INFO
# Scheduler configuration
SCHEDULER_LOG_LEVEL=INFO

FLOWER_PORT=80

#Secrets
24 changes: 24 additions & 0 deletions docker_compose/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,28 @@ services:
reservations:
cpus: ${WORKER_TRAP_CPU_RESERVATIONS:-0.25}
memory: ${WORKER_TRAP_MEMORY_RESERVATIONS:-250M}
flower:
<<: [*dns_and_networks, *dependency_and_restart_policy]
image: ${SC4SNMP_IMAGE}:${SC4SNMP_TAG:-latest}
command: [celery, flower]
environment:
<<: [
*general_sc4snmp_data,
*splunk_general_setup,
*splunk_extended_setup,
*workers_general_setup,
*pysnmp_debug
]
profiles: [debug]
ports:
- mode: host
protocol: tcp
published: ${FLOWER_PORT}
target: 5555
volumes:
- ${SCHEDULER_CONFIG_FILE_ABSOLUTE_PATH}:/app/config/config.yaml:ro
- worker-flower-pysnmp-cache-volume:/.pysnmp/:rw
- worker-flower-tmp:/tmp/:rw
volumes:
snmp-mibserver-tmp:
inventory-tmp:
Expand All @@ -248,3 +270,5 @@ volumes:
worker-sender-pysnmp-cache-volume:
worker-trap-tmp:
worker-trap-pysnmp-cache-volume:
worker-flower-tmp:
worker-flower-pysnmp-cache-volume:
18 changes: 18 additions & 0 deletions docs/internal/flower.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Celery admin panel (internal)

ikheifets-splunk marked this conversation as resolved.
Show resolved Hide resolved
Main component of SC4SNMP architecture is Celery framework that can run background and periodic tasks (like polling and walk). It can be helpful to administrate Celery cluster using admin panel with [Flower](https://github.com/mher/flower).

## k8s

Just add `flower` section on `values.yaml`:

```
flower:
enabled: true
loadBalancerIP: x.x.x.x
```


## docker-compose

Just use `--profile debug` flag to run optional `flower` service together with SC4SNMP: `docker-compose --profile debug up`
3 changes: 3 additions & 0 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ celery)
worker-sender)
celery -A splunk_connect_for_snmp.poller worker -l "$LOG_LEVEL" -Q send --autoscale=6,"$WORKER_CONCURRENCY"
;;
flower)
celery -A splunk_connect_for_snmp.poller flower
;;
*)
celery "$2"
;;
Expand Down
70 changes: 68 additions & 2 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ JSON-log-formatter ="^0.5.1"
pysnmplib = {git = "https://github.com/pysnmp/pysnmp.git", branch = "main"}
urllib3 = "^1.26.17"
jsonschema = "4.23.0"
flower = "^2.0.1"

[tool.poetry.group.dev.dependencies]
pytest = "^8.0.0"
Expand Down
Loading