-
Notifications
You must be signed in to change notification settings - Fork 25
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
Grafana OIDC #190
base: master
Are you sure you want to change the base?
Grafana OIDC #190
Conversation
@@ -218,7 +218,7 @@ containers: | |||
containerPort: {{ .Values.service.port }} | |||
protocol: TCP | |||
- name: {{ .Values.podPortName }} | |||
containerPort: 3000 |
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这里也不用改
@@ -2001,4 +2001,4 @@ prometheus: | |||
loki: | |||
enabled: true | |||
promtail: | |||
enabled: true | |||
enabled: true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
没有变化
@@ -146,6 +149,7 @@ func (m HelmComponentManager) CreateHelmResource( | |||
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()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
注释去掉
@@ -29,7 +34,8 @@ var ( | |||
) | |||
|
|||
const ( | |||
MonitorNamespace = "onecloud-monitoring" | |||
//MonitorNamespace = "onecloud-monitoring" | |||
MonitorNamespace = "kube-monitoring" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这里不用改
add: grafana oidc