Elasticsearch remote logging user
This patchset adds the ability to define an elasticsearch account to use for remote logging and centralized logging functions Change-Id: Iec61a130db6d94218893d3544e5a82c8ca04055b
This commit is contained in:
parent
e53d28718d
commit
9178fd1dac
@ -33,6 +33,10 @@ function start () {
|
|||||||
htpasswd -cb /usr/local/apache2/conf/.htpasswd "$ELASTICSEARCH_USERNAME" "$ELASTICSEARCH_PASSWORD"
|
htpasswd -cb /usr/local/apache2/conf/.htpasswd "$ELASTICSEARCH_USERNAME" "$ELASTICSEARCH_PASSWORD"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ ! -z $ELASTICSEARCH_LOGGING_USERNAME ]; then
|
||||||
|
htpasswd -b /usr/local/apache2/conf/.htpasswd "$ELASTICSEARCH_LOGGING_USERNAME" "$ELASTICSEARCH_LOGGING_PASSWORD"
|
||||||
|
fi
|
||||||
|
|
||||||
#Launch Apache on Foreground
|
#Launch Apache on Foreground
|
||||||
exec httpd -DFOREGROUND
|
exec httpd -DFOREGROUND
|
||||||
}
|
}
|
||||||
|
@ -91,6 +91,16 @@ spec:
|
|||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ $esUserSecret }}
|
name: {{ $esUserSecret }}
|
||||||
key: ELASTICSEARCH_PASSWORD
|
key: ELASTICSEARCH_PASSWORD
|
||||||
|
- name: ELASTICSEARCH_LOGGING_USERNAME
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: {{ $esUserSecret }}
|
||||||
|
key: ELASTICSEARCH_LOGGING_USERNAME
|
||||||
|
- name: ELASTICSEARCH_LOGGING_PASSWORD
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: {{ $esUserSecret }}
|
||||||
|
key: ELASTICSEARCH_LOGGING_PASSWORD
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
- name: pod-tmp
|
- name: pod-tmp
|
||||||
mountPath: /tmp
|
mountPath: /tmp
|
||||||
|
@ -29,6 +29,8 @@ type: Opaque
|
|||||||
data:
|
data:
|
||||||
ELASTICSEARCH_USERNAME: {{ .Values.endpoints.elasticsearch.auth.admin.username | b64enc }}
|
ELASTICSEARCH_USERNAME: {{ .Values.endpoints.elasticsearch.auth.admin.username | b64enc }}
|
||||||
ELASTICSEARCH_PASSWORD: {{ .Values.endpoints.elasticsearch.auth.admin.password | b64enc }}
|
ELASTICSEARCH_PASSWORD: {{ .Values.endpoints.elasticsearch.auth.admin.password | b64enc }}
|
||||||
|
ELASTICSEARCH_LOGGING_USERNAME: {{ .Values.endpoints.elasticsearch.auth.logging.username | b64enc }}
|
||||||
|
ELASTICSEARCH_LOGGING_PASSWORD: {{ .Values.endpoints.elasticsearch.auth.logging.password | b64enc }}
|
||||||
ELASTICSEARCH_URI: {{ $elasticsearch_uri | b64enc }}
|
ELASTICSEARCH_URI: {{ $elasticsearch_uri | b64enc }}
|
||||||
BIND_DN: {{ .Values.endpoints.ldap.auth.admin.bind | b64enc }}
|
BIND_DN: {{ .Values.endpoints.ldap.auth.admin.bind | b64enc }}
|
||||||
BIND_PASSWORD: {{ .Values.endpoints.ldap.auth.admin.password | b64enc }}
|
BIND_PASSWORD: {{ .Values.endpoints.ldap.auth.admin.password | b64enc }}
|
||||||
|
@ -788,6 +788,9 @@ endpoints:
|
|||||||
admin:
|
admin:
|
||||||
username: admin
|
username: admin
|
||||||
password: changeme
|
password: changeme
|
||||||
|
logging:
|
||||||
|
username: remote
|
||||||
|
password: changeme
|
||||||
hosts:
|
hosts:
|
||||||
data: elasticsearch-data
|
data: elasticsearch-data
|
||||||
default: elasticsearch-logging
|
default: elasticsearch-logging
|
||||||
|
Loading…
Reference in New Issue
Block a user