Skip to content

Grafana OIDC#190

Open
dylgo wants to merge 10 commits intoyunionio:masterfrom
dylgo:grafana-oidc
Open

Grafana OIDC#190
dylgo wants to merge 10 commits intoyunionio:masterfrom
dylgo:grafana-oidc

Conversation

@dylgo
Copy link

@dylgo dylgo commented Dec 14, 2022

add: grafana oidc

containerPort: {{ .Values.service.port }}
protocol: TCP
- name: {{ .Values.podPortName }}
containerPort: 3000
Copy link
Member

Choose a reason for hiding this comment

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

不要修改 charts/grafana/templates ,这里的 containerPort 用 3000 应该没有问题,可以使用 nodePort 30000 映射过来

type: ClusterIP
port: 80
targetPort: 3000
port: 30000
Copy link
Member

Choose a reason for hiding this comment

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

不要改这里,通过在 kubeserver 那边注入 service nodePort 进来

provisioning: /etc/grafana/provisioning
analytics:
check_for_updates: false
# paths:
Copy link
Member

Choose a reason for hiding this comment

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

这里也不用改

enabled: true
promtail:
enabled: true
enabled: true No newline at end of file
Copy link
Member

Choose a reason for hiding this comment

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

没有变化

if err := m.EnsureNamespace(cluster, m.namespace); err != nil {
return errors.Wrapf(err, "%s ensure namespace %q", m.releaseName, m.namespace)
}
log.Errorf("**** helm install vals: %s", jsonutils.Marshal(vals).PrettyString())
Copy link
Member

Choose a reason for hiding this comment

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

注释去掉

const (
MonitorNamespace = "onecloud-monitoring"
//MonitorNamespace = "onecloud-monitoring"
MonitorNamespace = "kube-monitoring"
Copy link
Member

Choose a reason for hiding this comment

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

这里不用改

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants