DEV-359: feat: added jaeger-operator/jaeger

master
Ketelsen, Sven 4 years ago
parent e90e20615e
commit 65df2886e3

@ -160,6 +160,7 @@ shared_service_redis_hostname: "{{ stage }}-redis-01.{{ domain }}"
shared_service_kube_argocd_hostname: "{{ stage }}-kube-argocd.{{ domain }}" shared_service_kube_argocd_hostname: "{{ stage }}-kube-argocd.{{ domain }}"
shared_service_kube_awx_hostname: "{{ stage }}-kube-awx.{{ domain }}" shared_service_kube_awx_hostname: "{{ stage }}-kube-awx.{{ domain }}"
shared_service_kube_prometheus_hostname: "{{ stage }}-kube-prometheus.{{ domain }}" shared_service_kube_prometheus_hostname: "{{ stage }}-kube-prometheus.{{ domain }}"
shared_service_kube_jaeger_collector_hostname: "{{ stage }}-kube-jaeger-collector.{{ domain }}"
shared_service_pdns_hostname: "{{ stage }}-pdns-01.{{ domain }}" shared_service_pdns_hostname: "{{ stage }}-pdns-01.{{ domain }}"
shared_service_webdav_hostname: "{{ stage }}-webdav-01.{{ domain }}" shared_service_webdav_hostname: "{{ stage }}-webdav-01.{{ domain }}"
shared_service_keycloak_hostname: "{{ stage }}-keycloak-01.{{ domain }}" shared_service_keycloak_hostname: "{{ stage }}-keycloak-01.{{ domain }}"
@ -266,6 +267,10 @@ shared_service_hosts: [
ip: "{{ shared_service_kube_ip }}", ip: "{{ shared_service_kube_ip }}",
name: "{{ shared_service_kube_prometheus_hostname }}" name: "{{ shared_service_kube_prometheus_hostname }}"
}, },
{
ip: "{{ shared_service_kube_ip }}",
name: "{{ shared_service_kube_jaeger_collector_hostname }}"
},
{ {
ip: "{{ shared_service_management_ip }}", ip: "{{ shared_service_management_ip }}",
name: "{{ management_service_connect_hostname }}" name: "{{ management_service_connect_hostname }}"

@ -130,6 +130,12 @@ shared_service_kube_node_03: "{{ stage_server_infos
| list | list
| first | first
| default('-') }}" | default('-') }}"
shared_service_management_ip: "{{ stage_server_infos
| selectattr('name', 'match', stage + '-management-01' )
| map(attribute='private_ip')
| list
| first
| default('-') }}"
prometheus_federation_enabled: false prometheus_federation_enabled: false
shared_service_kube_ip: "{{ stage_private_ingress_loadbalancer_ip | default('-') }}" shared_service_kube_ip: "{{ stage_private_ingress_loadbalancer_ip | default('-') }}"
@ -155,6 +161,7 @@ shared_service_redis_hostname: "{{ stage }}-redis-01.{{ domain }}"
shared_service_kube_argocd_hostname: "{{ stage }}-kube-argocd.{{ domain }}" shared_service_kube_argocd_hostname: "{{ stage }}-kube-argocd.{{ domain }}"
shared_service_kube_awx_hostname: "{{ stage }}-awx-01.{{ domain }}" shared_service_kube_awx_hostname: "{{ stage }}-awx-01.{{ domain }}"
shared_service_kube_prometheus_hostname: "{{ stage }}-kube-prometheus.{{ domain }}" shared_service_kube_prometheus_hostname: "{{ stage }}-kube-prometheus.{{ domain }}"
shared_service_kube_jaeger_collector_hostname: "{{ stage }}-kube-jaeger-collector.{{ domain }}"
shared_service_pdns_hostname: "{{ stage }}-pdns-01.{{ domain }}" shared_service_pdns_hostname: "{{ stage }}-pdns-01.{{ domain }}"
shared_service_webdav_hostname: "{{ stage }}-webdav-01.{{ domain }}" shared_service_webdav_hostname: "{{ stage }}-webdav-01.{{ domain }}"
shared_service_keycloak_hostname: "{{ stage }}-keycloak-01.{{ domain }}" shared_service_keycloak_hostname: "{{ stage }}-keycloak-01.{{ domain }}"
@ -249,9 +256,25 @@ shared_service_hosts: [
ip: "{{ shared_service_pdns_ip }}", ip: "{{ shared_service_pdns_ip }}",
name: "{{ shared_service_pdns_hostname }}" name: "{{ shared_service_pdns_hostname }}"
}, },
{
ip: "{{ shared_service_kube_ip }}",
name: "{{ shared_service_kube_argocd_hostname }}"
},
{
ip: "{{ shared_service_kube_ip }}",
name: "{{ shared_service_kube_awx_hostname }}"
},
{ {
ip: "{{ shared_service_kube_ip }}", ip: "{{ shared_service_kube_ip }}",
name: "{{ shared_service_kube_prometheus_hostname }}" name: "{{ shared_service_kube_prometheus_hostname }}"
},
{
ip: "{{ shared_service_kube_ip }}",
name: "{{ shared_service_kube_jaeger_collector_hostname }}"
},
{
ip: "{{ shared_service_management_ip }}",
name: "{{ management_service_connect_hostname }}"
} }
] ]

@ -160,6 +160,7 @@ shared_service_redis_hostname: "{{ stage }}-redis-01.{{ domain }}"
shared_service_kube_argocd_hostname: "{{ stage }}-kube-argocd.{{ domain }}" shared_service_kube_argocd_hostname: "{{ stage }}-kube-argocd.{{ domain }}"
shared_service_kube_awx_hostname: "{{ stage }}-kube-awx.{{ domain }}" shared_service_kube_awx_hostname: "{{ stage }}-kube-awx.{{ domain }}"
shared_service_kube_prometheus_hostname: "{{ stage }}-kube-prometheus.{{ domain }}" shared_service_kube_prometheus_hostname: "{{ stage }}-kube-prometheus.{{ domain }}"
shared_service_kube_jaeger_collector_hostname: "{{ stage }}-kube-jaeger-collector.{{ domain }}"
shared_service_pdns_hostname: "{{ stage }}-pdns-01.{{ domain }}" shared_service_pdns_hostname: "{{ stage }}-pdns-01.{{ domain }}"
shared_service_webdav_hostname: "{{ stage }}-webdav-01.{{ domain }}" shared_service_webdav_hostname: "{{ stage }}-webdav-01.{{ domain }}"
shared_service_keycloak_hostname: "{{ stage }}-keycloak-01.{{ domain }}" shared_service_keycloak_hostname: "{{ stage }}-keycloak-01.{{ domain }}"
@ -266,6 +267,10 @@ shared_service_hosts: [
ip: "{{ shared_service_kube_ip }}", ip: "{{ shared_service_kube_ip }}",
name: "{{ shared_service_kube_prometheus_hostname }}" name: "{{ shared_service_kube_prometheus_hostname }}"
}, },
{
ip: "{{ shared_service_kube_ip }}",
name: "{{ shared_service_kube_jaeger_collector_hostname }}"
},
{ {
ip: "{{ shared_service_management_ip }}", ip: "{{ shared_service_management_ip }}",
name: "{{ management_service_connect_hostname }}" name: "{{ management_service_connect_hostname }}"

@ -197,6 +197,40 @@ k8s_argocd_helm__release_values:
selfHeal: true selfHeal: true
syncOptions: syncOptions:
- CreateNamespace=true - CreateNamespace=true
-
name: jaeger-operator
namespace: '{{ k8s_argocd_helm__release_namespace }}'
destination:
namespace: observability
server: https://kubernetes.default.svc
project: infrastructure
source:
path: config/default
repoURL: https://{{ shared_service_gitea_hostname }}/argocd/jaeger-operator
targetRevision: v1.31.0
syncPolicy:
automated:
prune: true
selfHeal: true
syncOptions:
- CreateNamespace=true
-
name: jaeger
namespace: '{{ k8s_argocd_helm__release_namespace }}'
destination:
namespace: jaeger
server: https://kubernetes.default.svc
project: infrastructure
source:
path: apps/{{ stage }}/jaeger
repoURL: https://{{ shared_service_gitea_hostname }}/gitea-admin/argocd.git
targetRevision: HEAD
syncPolicy:
automated:
prune: true
selfHeal: true
syncOptions:
- CreateNamespace=true
dex: dex:
enabled: false enabled: false
redis: redis:

@ -65,10 +65,6 @@ traefik_docker: {
internal: "{{ monitor_port_harbor }}" internal: "{{ monitor_port_harbor }}"
}, },
], ],
dns: [
'"8.8.8.8"',
'"8.8.8.4"',
],
} }
] ]
} }

@ -15,9 +15,6 @@
# "ClientPort" = "drop" # "ClientPort" = "drop"
"ClientUsername" = "drop" "ClientUsername" = "drop"
[api]
dashboard = true
[metrics] [metrics]
[metrics.prometheus] [metrics.prometheus]
manualRouting = true manualRouting = true
@ -26,6 +23,14 @@
buckets = [0.1,0.3,1.2,5.0] buckets = [0.1,0.3,1.2,5.0]
entryPoint = "admin-service" entryPoint = "admin-service"
#[tracing]
# serviceName = "{{ traefik_id }}"
# [tracing.jaeger.collector]
# endpoint = "http://{{ shared_service_kube_jaeger_collector_hostname | default('127.0.0.1') }}:80/api/traces"
[api]
dashboard = true
[entryPoints] [entryPoints]
### http -> https ### ### http -> https ###
[entryPoints.web] [entryPoints.web]

Loading…
Cancel
Save