diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..f1435733 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,44 @@ +FROM openjdk:8-jdk-alpine3.9 + +LABEL author="yangvipguang" + +ENV VERSION 2.1.0 +ENV JAR_PATH kafka-manager-web/target +COPY $JAR_PATH/kafka-manager-web-$VERSION-SNAPSHOT.jar /tmp/app.jar +COPY $JAR_PATH/application.yml /km/ + +RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories +RUN apk add --no-cache --virtual .build-deps \ + font-adobe-100dpi \ + ttf-dejavu \ + fontconfig \ + curl \ + apr \ + apr-util \ + apr-dev \ + tomcat-native \ + && apk del .build-deps + +ENV AGENT_HOME /opt/agent/ + +WORKDIR /tmp +COPY ./docker-depends/config.yaml $AGENT_HOME +COPY ./docker-depends/jmx_prometheus_javaagent-0.14.0.jar $AGENT_HOME + +ENV JAVA_AGENT="-javaagent:$AGENT_HOME/jmx_prometheus_javaagent-0.14.0.jar=9999:$AGENT_HOME/config.yaml" + +ENV JAVA_HEAP_OPTS="-Xms1024M -Xmx1024M -Xmn100M " + +ENV JAVA_OPTS="-verbose:gc \ + -XX:+PrintGC -XX:+PrintGCDetails -XX:+PrintHeapAtGC -Xloggc:/tmp/gc.log -XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps \ + -XX:MaxMetaspaceSize=256M -XX:+DisableExplicitGC -XX:+UseStringDeduplication \ + -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -XX:-UseContainerSupport" +#-Xlog:gc -Xlog:gc* -Xlog:gc+heap=trace -Xlog:safepoint + +EXPOSE 8080 9999 + +ENTRYPOINT ["sh","-c","java -jar $JAVA_HEAP_OPTS $JAVA_OPTS /tmp/app.jar --spring.config.location=/km/application.yml"] + +## 默认不带Prometheus JMX监控，需要可以自行取消以下注释并注释上面一行默认Entrypoint 命令。 +## ENTRYPOINT ["sh","-c","java -jar $JAVA_AGENT $JAVA_HEAP_OPTS $JAVA_OPTS /tmp/app.jar --spring.config.location=/km/application.yml"] + diff --git a/README.md b/README.md index 628d5555..d0887cac 100644 --- a/README.md +++ b/README.md @@ -5,66 +5,80 @@ **一站式`Apache Kafka`集群指标监控与运维管控平台** ---- - -## 主要功能特性 - -### 快速体验 -- 体验地址 http://117.51.146.109:8080 账号密码 admin/admin - -### 集群监控维度 - -- 多版本集群管控，支持从`0.10.2`到`2.x`版本； -- 集群Topic、Broker等多维度历史与实时关键指标查看； -### 集群管控维度 - -- 集群运维，包括逻辑Region方式管理集群 -- Broker运维，包括优先副本选举 -- Topic运维，包括创建、查询、扩容、修改属性、数据采样及迁移等； -- 消费组运维，包括指定时间或指定偏移两种方式进行重置消费偏移 +阅读本README文档，您可以了解到滴滴Logi-KafkaManager的用户群体、产品定位等信息，并通过体验地址，快速体验Kafka集群指标监控与运维管控的全流程。
若滴滴Logi-KafkaManager已在贵司的生产环境进行使用，并想要获得官方更好地支持和指导，可以通过[`OCE认证`](http://obsuite.didiyun.com/open/openAuth)，加入官方交流平台。 -### 用户使用维度 +## 1 产品简介 +滴滴Logi-KafkaManager脱胎于滴滴内部多年的Kafka运营实践经验，是面向Kafka用户、Kafka运维人员打造的共享多租户Kafka云平台。专注于Kafka运维管控、监控告警、资源治理等核心场景，经历过大规模集群、海量大数据的考验。内部满意度高达90%的同时，还与多家知名企业达成商业化合作。 -- Kafka用户、Kafka研发、Kafka运维 视角区分 -- Kafka用户、Kafka研发、Kafka运维 权限区分 +### 1.1 快速体验地址 +- 体验地址 http://117.51.146.109:8080 账号密码 admin/admin + +### 1.2 体验地图 +相比较于同类产品的用户视角单一（大多为管理员视角），滴滴Logi-KafkaManager建立了基于分角色、多场景视角的体验地图。分别是：**用户体验地图、运维体验地图、运营体验地图** + +#### 1.2.1 用户体验地图 +- 平台租户申请  ：申请应用（App）作为Kafka中的用户名，并用 AppID+password作为身份验证 +- 集群资源申请  ：按需申请、按需使用。可使用平台提供的共享集群，也可为应用申请独立的集群 +- Topic   申   请  ：可根据应用（App）创建Topic，或者申请其他topic的读写权限 +- Topic   运   维  ：Topic数据采样、调整配额、申请分区等操作 +- 指   标  监   控  ：基于Topic生产消费各环节耗时统计，监控不同分位数性能指标 +- 消 费 组 运 维 ：支持将消费偏移重置至指定时间或指定位置 + +#### 1.2.2 运维体验地图 +- 多版本集群管控  ：支持从`0.10.2`到`2.x`版本 +- 集    群    监   控  ：集群Topic、Broker等多维度历史与实时关键指标查看，建立健康分体系 +- 集    群    运   维  ：划分部分Broker作为Region，使用Region定义资源划分单位，并按照业务、保障能力区分逻辑集群 +- Broker    运    维  ：包括优先副本选举等操作 +- Topic      运    维  ：包括创建、查询、扩容、修改属性、迁移、下线等 -## kafka-manager架构图 +#### 1.2.3 运营体验地图 +- 资  源  治  理  ：沉淀资源治理方法。针对Topic分区热点、分区不足等高频常见问题，沉淀资源治理方法，实现资源治理专家化 +- 资  源  审  批  ：工单体系。Topic创建、调整配额、申请分区等操作，由专业运维人员审批，规范资源使用，保障平台平稳运行 +- 账  单  体  系  ：成本控制。Topic资源、集群资源按需申请、按需使用。根据流量核算费用，帮助企业建设大数据成本核算体系 + +### 1.3 核心优势 +- 高 效 的 问 题 定 位  ：监控多项核心指标，统计不同分位数据，提供种类丰富的指标监控报表，帮助用户、运维人员快速高效定位问题 +- 便 捷 的 集 群 运 维  ：按照Region定义集群资源划分单位，将逻辑集群根据保障等级划分。在方便资源隔离、提高扩展能力的同时，实现对服务端的强管控 +- 专 业 的 资 源 治 理  ：基于滴滴内部多年运营实践，沉淀资源治理方法，建立健康分体系。针对Topic分区热点、分区不足等高频常见问题，实现资源治理专家化 +- 友 好 的 运 维 生 态  ：与滴滴夜莺监控告警系统打通，集成监控告警、集群部署、集群升级等能力。形成运维生态，凝练专家服务，使运维更高效 + +### 1.4 滴滴Logi-KafkaManager架构图 ![kafka-manager-arch](https://img-ys011.didistatic.com/static/dicloudpub/do1_xgDHNDLj2ChKxctSuf72) -## 相关文档 +## 2 相关文档 -- [kafka-manager 安装手册](docs/install_guide/install_guide_cn.md) -- [kafka-manager 接入集群](docs/user_guide/add_cluster/add_cluster.md) -- [kafka-manager 用户使用手册](docs/user_guide/user_guide_cn.md) -- [kafka-manager FAQ](docs/user_guide/faq.md) +- [滴滴Logi-KafkaManager 安装手册](docs/install_guide/install_guide_cn.md) +- [滴滴Logi-KafkaManager 接入集群](docs/user_guide/add_cluster/add_cluster.md) +- [滴滴Logi-KafkaManager 用户使用手册](docs/user_guide/user_guide_cn.md) +- [滴滴Logi-KafkaManager FAQ](docs/user_guide/faq.md) -## 钉钉交流群 +## 3 滴滴Logi开源用户钉钉交流群 -![dingding_group](./docs/assets/images/common/dingding_group.jpg) +![dingding_group](./docs/assets/images/common/dingding_group.jpg) 钉钉群ID：32821440 -## OCE认证 -OCE是一个认证机制和交流平台，为Logi-KafkaManager生产用户量身打造，我们会为OCE企业提供更好的技术支持，比如专属的技术沙龙、企业一对一的交流机会、专属的答疑群等，如果贵司Logi-KafkaManager上了生产，[快来加入吧](http://obsuite.didiyun.com/open/openAuth) +## 4 OCE认证 +OCE是一个认证机制和交流平台，为滴滴Logi-KafkaManager生产用户量身打造，我们会为OCE企业提供更好的技术支持，比如专属的技术沙龙、企业一对一的交流机会、专属的答疑群等，如果贵司Logi-KafkaManager上了生产，[快来加入吧](http://obsuite.didiyun.com/open/openAuth) -## 项目成员 +## 5 项目成员 -### 内部核心人员 +### 5.1 内部核心人员 `iceyuhui`、`liuyaguang`、`limengmonty`、`zhangliangmike`、`nullhuangyiming`、`zengqiao`、`eilenexuzhe`、`huangjiaweihjw`、`zhaoyinrui`、`marzkonglingxu`、`joysunchao` -### 外部贡献者 +### 5.2 外部贡献者 `fangjunyu`、`zhoutaiyang` -## 协议 +## 6 协议 `kafka-manager`基于`Apache-2.0`协议进行分发和使用，更多信息参见[协议文件](./LICENSE) diff --git a/charts/didi-km/.helmignore b/charts/didi-km/.helmignore new file mode 100644 index 00000000..0e8a0eb3 --- /dev/null +++ b/charts/didi-km/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/charts/didi-km/Chart.yaml b/charts/didi-km/Chart.yaml new file mode 100644 index 00000000..7161f735 --- /dev/null +++ b/charts/didi-km/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: didi-km +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +# It is recommended to use it with quotes. +appVersion: "1.16.0" diff --git a/charts/didi-km/templates/NOTES.txt b/charts/didi-km/templates/NOTES.txt new file mode 100644 index 00000000..e9c3e7e8 --- /dev/null +++ b/charts/didi-km/templates/NOTES.txt @@ -0,0 +1,22 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "didi-km.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "didi-km.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "didi-km.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "didi-km.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/charts/didi-km/templates/_helpers.tpl b/charts/didi-km/templates/_helpers.tpl new file mode 100644 index 00000000..23314fd4 --- /dev/null +++ b/charts/didi-km/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "didi-km.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "didi-km.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "didi-km.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "didi-km.labels" -}} +helm.sh/chart: {{ include "didi-km.chart" . }} +{{ include "didi-km.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "didi-km.selectorLabels" -}} +app.kubernetes.io/name: {{ include "didi-km.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "didi-km.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "didi-km.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/charts/didi-km/templates/configmap.yaml b/charts/didi-km/templates/configmap.yaml new file mode 100644 index 00000000..ffc75ec5 --- /dev/null +++ b/charts/didi-km/templates/configmap.yaml @@ -0,0 +1,88 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: km-cm +data: + application.yml: | + server: + port: 8080 + tomcat: + accept-count: 1000 + max-connections: 10000 + max-threads: 800 + min-spare-threads: 100 + + spring: + application: + name: kafkamanager + datasource: + kafka-manager: + jdbc-url: jdbc:mysql://xxxxx:3306/kafka-manager?characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false + username: admin + password: admin + driver-class-name: com.mysql.jdbc.Driver + main: + allow-bean-definition-overriding: true + + profiles: + active: dev + servlet: + multipart: + max-file-size: 100MB + max-request-size: 100MB + + logging: + config: classpath:logback-spring.xml + + custom: + idc: cn + jmx: + max-conn: 20 + store-metrics-task: + community: + broker-metrics-enabled: true + topic-metrics-enabled: true + didi: + app-topic-metrics-enabled: false + topic-request-time-metrics-enabled: false + topic-throttled-metrics: false + save-days: 7 + + # 任务相关的开关 + task: + op: + sync-topic-enabled: false # 未落盘的Topic定期同步到DB中 + + account: + ldap: + + kcm: + enabled: false + storage: + base-url: http://127.0.0.1 + n9e: + base-url: http://127.0.0.1:8004 + user-token: 12345678 + timeout: 300 + account: root + script-file: kcm_script.sh + + monitor: + enabled: false + n9e: + nid: 2 + user-token: 1234567890 + mon: + base-url: http://127.0.0.1:8032 + sink: + base-url: http://127.0.0.1:8006 + rdb: + base-url: http://127.0.0.1:80 + + notify: + kafka: + cluster-id: 95 + topic-name: didi-kafka-notify + order: + detail-url: http://127.0.0.1 + diff --git a/charts/didi-km/templates/deployment.yaml b/charts/didi-km/templates/deployment.yaml new file mode 100644 index 00000000..4754b53e --- /dev/null +++ b/charts/didi-km/templates/deployment.yaml @@ -0,0 +1,56 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "didi-km.fullname" . }} + labels: + {{- include "didi-km.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "didi-km.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "didi-km.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "didi-km.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: 8080 + protocol: TCP + - name: jmx-metrics + containerPort: 9999 + protocol: TCP + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/charts/didi-km/templates/hpa.yaml b/charts/didi-km/templates/hpa.yaml new file mode 100644 index 00000000..209d7ae4 --- /dev/null +++ b/charts/didi-km/templates/hpa.yaml @@ -0,0 +1,28 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2beta1 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "didi-km.fullname" . }} + labels: + {{- include "didi-km.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "didi-km.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/charts/didi-km/templates/ingress.yaml b/charts/didi-km/templates/ingress.yaml new file mode 100644 index 00000000..47aec7f2 --- /dev/null +++ b/charts/didi-km/templates/ingress.yaml @@ -0,0 +1,41 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "didi-km.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "didi-km.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + backend: + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} diff --git a/charts/didi-km/templates/service.yaml b/charts/didi-km/templates/service.yaml new file mode 100644 index 00000000..7fcbc5ba --- /dev/null +++ b/charts/didi-km/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "didi-km.fullname" . }} + labels: + {{- include "didi-km.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "didi-km.selectorLabels" . | nindent 4 }} diff --git a/charts/didi-km/templates/serviceaccount.yaml b/charts/didi-km/templates/serviceaccount.yaml new file mode 100644 index 00000000..4f2676ee --- /dev/null +++ b/charts/didi-km/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "didi-km.serviceAccountName" . }} + labels: + {{- include "didi-km.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/charts/didi-km/templates/tests/test-connection.yaml b/charts/didi-km/templates/tests/test-connection.yaml new file mode 100644 index 00000000..b5b41d4f --- /dev/null +++ b/charts/didi-km/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "didi-km.fullname" . }}-test-connection" + labels: + {{- include "didi-km.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "didi-km.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/charts/didi-km/values.yaml b/charts/didi-km/values.yaml new file mode 100644 index 00000000..a5f49e40 --- /dev/null +++ b/charts/didi-km/values.yaml @@ -0,0 +1,79 @@ +# Default values for didi-km. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: docker.io/yangvipguang/km + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "v18" + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "km" + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + type: ClusterIP + port: 8080 + +ingress: + enabled: false + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: [] + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +resources: + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + limits: + cpu: 50m + memory: 2048Mi + requests: + cpu: 10m + memory: 200Mi + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +nodeSelector: {} + +tolerations: [] + +affinity: {} diff --git a/docker-depends/config.yaml b/docker-depends/config.yaml new file mode 100644 index 00000000..d4b7b547 --- /dev/null +++ b/docker-depends/config.yaml @@ -0,0 +1,5 @@ +--- + startDelaySeconds: 0 + ssl: false + lowercaseOutputName: false + lowercaseOutputLabelNames: false diff --git a/docker-depends/jmx_prometheus_javaagent-0.14.0.jar b/docker-depends/jmx_prometheus_javaagent-0.14.0.jar new file mode 100644 index 00000000..54b633bf Binary files /dev/null and b/docker-depends/jmx_prometheus_javaagent-0.14.0.jar differ diff --git a/docs/dev_guide/use_mysql_8.md b/docs/dev_guide/use_mysql_8.md index d4a33b2a..6c8f6b38 100644 --- a/docs/dev_guide/use_mysql_8.md +++ b/docs/dev_guide/use_mysql_8.md @@ -15,7 +15,7 @@ 当前因为无法同时兼容`MySQL 8`与`MySQL 5.7`，因此代码中默认的版本还是`MySQL 5.7`。 -当前如需使用`MySQL 8`，则续按照下述流程进行简单修改代码。 +当前如需使用`MySQL 8`，则需按照下述流程进行简单修改代码。 - Step1. 修改application.yml中的MySQL驱动类 diff --git a/docs/user_guide/alarm_rules.md b/docs/user_guide/alarm_rules.md index f4356790..57cba628 100644 --- a/docs/user_guide/alarm_rules.md +++ b/docs/user_guide/alarm_rules.md @@ -1,4 +1,4 @@ -![kafka-manager-logo](../assets/images/common/logo_name.png)) +![kafka-manager-logo](../assets/images/common/logo_name.png) **一站式`Apache Kafka`集群指标监控与运维管控平台** diff --git a/docs/user_guide/resource_apply/resource_apply.md b/docs/user_guide/resource_apply/resource_apply.md new file mode 100644 index 00000000..427d8b14 --- /dev/null +++ b/docs/user_guide/resource_apply/resource_apply.md @@ -0,0 +1,32 @@ + +--- + +![kafka-manager-logo](../assets/images/common/logo_name.png) + +**一站式`Apache Kafka`集群指标监控与运维管控平台** + +--- + + +# 资源申请文档 + +## 主要名词解释 + +- 应用（App）：作为Kafka中的账户，使用AppID+password作为身份标识 +- 集群：可使用平台提供的共享集群，也可为某一应用申请单独的集群 +- Topic：可申请创建Topic或申请其他Topic的生产/消费权限。进行生产/消费时通过Topic+AppID进行身份鉴权 +![production_consumption_flow](/production_consumption_flow.png) + +## 应用申请 +应用（App）作为Kafka中的账户，使用AppID+password作为身份标识。对Topic进行生产/消费时通过Topic+AppID进行身份鉴权。 + +用户申请应用，经由运维人员审批，审批通过后获得AppID和密钥 + +## 集群申请 +可使用平台提供的共享集群，若对隔离性、稳定性、生产消费速率有更高的需求，可对某一应用申请单独的集群 + +## Topic申请 +- 用户可根据已申请的应用创建Topic。创建后，应用负责人默认拥有该Topic的生产/消费权限和管理权限 +- 也可申请其他Topic的生产、消费权限。经由Topic所属应用的负责人审批后，即可拥有相应权限。 + + diff --git a/kafka-manager-web/src/main/resources/application.yml b/kafka-manager-web/src/main/resources/application.yml index 73773981..8c137da8 100644 --- a/kafka-manager-web/src/main/resources/application.yml +++ b/kafka-manager-web/src/main/resources/application.yml @@ -11,7 +11,7 @@ spring: name: kafkamanager datasource: kafka-manager: - jdbc-url: jdbc:mysql://127.0.0.1:3306/logi_kafka_manager?characterEncoding=UTF-8&serverTimezone=GMT%2B8 + jdbc-url: jdbc:mysql://127.0.0.1:3306/logi_kafka_manager?characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8 username: admin password: admin driver-class-name: com.mysql.jdbc.Driver