Skip to content

Commit b4eedfe

Browse files
committed
bump up opentelemetry demo lite chart
1 parent 84f97b4 commit b4eedfe

File tree

2 files changed

+110
-116
lines changed

2 files changed

+110
-116
lines changed

charts/opentelemetry-demo-lite/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: opentelemetry-demo-lite
33
type: application
4-
version: 1.1.8
4+
version: 1.1.9
55
icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
66
description: A helm chart for openTelemetry community demo application integration with other component(lite version).
77
sources:

charts/opentelemetry-demo-lite/values.schema.json

Lines changed: 109 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -2,144 +2,138 @@
22
"$schema": "http://json-schema.org/schema#",
33
"type": "object",
44
"properties": {
5-
"opentelemetry-demo-lite": {
5+
"global": {
66
"type": "object",
77
"title": "Opentelemetry demo lite",
88
"description": "The Opentelemetry demo lite is a microservice-based distributed system. This demo aims to help users quickly and easily trial the features of DaoCloud Enterprise.",
99
"properties": {
10-
"global": {
10+
"observability": {
1111
"type": "object",
12-
"title": " ",
12+
"title": "Observability",
1313
"properties": {
14-
"observability": {
14+
"adServiceJVMEnable": {
15+
"type": "boolean",
16+
"title": "Enable JVM monitor",
17+
"description": "Enable JVM monitoring for adservice service only.",
18+
"default": true
19+
}
20+
}
21+
},
22+
"opentelemetryDemo": {
23+
"type": "object",
24+
"title": "Service Mesh",
25+
"properties": {
26+
"istioSidecar": {
1527
"type": "object",
16-
"title": "Observability",
28+
"title": " ",
1729
"properties": {
18-
"adServiceJVMEnable": {
30+
"enabled": {
1931
"type": "boolean",
20-
"title": "Enable JVM monitor",
21-
"description": "Enable JVM monitoring for adservice service only.",
22-
"default": true
32+
"title": "Enable Service Mesh",
33+
"description": "Please ensure that the cluster has enabled the Istio plugin. The sidecar will be injected for all services by default.",
34+
"default": false
2335
}
2436
}
25-
},
26-
"opentelemetryDemo": {
37+
}
38+
}
39+
},
40+
"microservices": {
41+
"type": "object",
42+
"title": "Microservices",
43+
"description": "Please ensure there are available registry instances. In case the parameters are incorrectly filled in, the services would fail to run properly. By default, only adservice and dataservice would be integrated into the Registry and Sentinel governance would be enabled.",
44+
"properties": {
45+
"nacos": {
2746
"type": "object",
28-
"title": "Service Mesh",
47+
"title": "nacos settings",
48+
"required": [
49+
"registryName",
50+
"registryEndpoint",
51+
"registryServiceGroup",
52+
"registryInstanceGroup"
53+
],
2954
"properties": {
30-
"istioSidecar": {
31-
"type": "object",
32-
"title": " ",
33-
"properties": {
34-
"enabled": {
35-
"type": "boolean",
36-
"title": "Enable Service Mesh",
37-
"description": "Please ensure that the cluster has enabled the Istio plugin. The sidecar will be injected for all services by default.",
38-
"default": false
39-
}
40-
}
55+
"enabled": {
56+
"type": "boolean",
57+
"title": "Enable Nacos",
58+
"description": "If enabled, The Chart will deploy two extra services: dataservice and mysql. The adservice will call dataservice which uses mysql to store Ad data to get Ad data.",
59+
"default": false
60+
},
61+
"registryName": {
62+
"type": "string",
63+
"title": "Registry name",
64+
"default": "nacos"
65+
},
66+
"registryEndpoint": {
67+
"type": "string",
68+
"title": "Registry endpoint",
69+
"default": "nacos:8848"
70+
},
71+
"registryNamespace": {
72+
"type": "string",
73+
"title": "Registry namespace",
74+
"default": ""
75+
},
76+
"registryServiceGroup": {
77+
"type": "string",
78+
"title": "Registry service group",
79+
"default": "DEFAULT_GROUP"
80+
},
81+
"registryInstanceGroup": {
82+
"type": "string",
83+
"title": "Registry instance group",
84+
"default": "DEFAULT"
85+
},
86+
"username": {
87+
"type": "string",
88+
"title": "Username",
89+
"default": ""
90+
},
91+
"password": {
92+
"type": "string",
93+
"title": "Password",
94+
"default": ""
4195
}
4296
}
4397
},
44-
"microservices": {
98+
"sentinel": {
4599
"type": "object",
46-
"title": "Microservices",
47-
"description": "Please ensure there are available registry instances. In case the parameters are incorrectly filled in, the services would fail to run properly. By default, only adservice and dataservice would be integrated into the Registry and Sentinel governance would be enabled.",
100+
"title": "Sentinel settings",
101+
"required": [
102+
"endpoint"
103+
],
48104
"properties": {
49-
"nacos": {
50-
"type": "object",
51-
"title": "nacos settings",
52-
"required": [
53-
"registryName",
54-
"registryEndpoint",
55-
"registryServiceGroup",
56-
"registryInstanceGroup"
57-
],
58-
"properties": {
59-
"enabled": {
60-
"type": "boolean",
61-
"title": "Enable Nacos",
62-
"description": "If enabled, The Chart will deploy two extra services: dataservice and mysql. The adservice will call dataservice which uses mysql to store Ad data to get Ad data.",
63-
"default": false
64-
},
65-
"registryName": {
66-
"type": "string",
67-
"title": "Registry name",
68-
"default": "nacos"
69-
},
70-
"registryEndpoint": {
71-
"type": "string",
72-
"title": "Registry endpoint",
73-
"default": "nacos:8848"
74-
},
75-
"registryNamespace": {
76-
"type": "string",
77-
"title": "Registry namespace",
78-
"default": ""
79-
},
80-
"registryServiceGroup": {
81-
"type": "string",
82-
"title": "Registry service group",
83-
"default": "DEFAULT_GROUP"
84-
},
85-
"registryInstanceGroup": {
86-
"type": "string",
87-
"title": "Registry instance group",
88-
"default": "DEFAULT"
89-
},
90-
"username": {
91-
"type": "string",
92-
"title": "Username",
93-
"default": ""
94-
},
95-
"password": {
96-
"type": "string",
97-
"title": "Password",
98-
"default": ""
99-
}
100-
}
105+
"enabled": {
106+
"type": "boolean",
107+
"title": "Enable sentinel",
108+
"description": "please ensure Nacos is enabled and that the parameters above are filled in correctly for the Registry. Meanwhile, Please ensure that Sentinel governance has been enabled in the same Registry.",
109+
"default": false
101110
},
102-
"sentinel": {
103-
"type": "object",
104-
"title": "Sentinel settings",
105-
"required": [
106-
"endpoint"
107-
],
108-
"properties": {
109-
"enabled": {
110-
"type": "boolean",
111-
"title": "Enable sentinel",
112-
"description": "please ensure Nacos is enabled and that the parameters above are filled in correctly for the Registry. Meanwhile, Please ensure that Sentinel governance has been enabled in the same Registry.",
113-
"default": false
114-
},
115-
"endpoint": {
116-
"type": "string",
117-
"title": "Endpoint",
118-
"default": "sentinel:8080"
119-
}
120-
}
111+
"endpoint": {
112+
"type": "string",
113+
"title": "Endpoint",
114+
"default": "sentinel:8080"
121115
}
122116
}
123-
},
124-
"middleware": {
117+
}
118+
}
119+
},
120+
"middleware": {
121+
"type": "object",
122+
"title": "Middleware",
123+
"properties": {
124+
"redis": {
125125
"type": "object",
126-
"title": "Middleware",
126+
"title": "redis settings",
127127
"properties": {
128-
"redis": {
129-
"type": "object",
130-
"title": "redis settings",
131-
"properties": {
132-
"deployBy": {
133-
"type": "string",
134-
"title": "redis deploy way",
135-
"description": "Use built-in redis by default. If you want to use a redis create by redis operater, Please chooise redisCR and make sure redis operator is ready.",
136-
"default": "builtin",
137-
"enum": [
138-
"builtin",
139-
"redisCR"
140-
]
141-
}
142-
}
128+
"deployBy": {
129+
"type": "string",
130+
"title": "redis deploy way",
131+
"description": "Use built-in redis by default. If you want to use a redis create by redis operater, Please chooise redisCR and make sure redis operator is ready.",
132+
"default": "builtin",
133+
"enum": [
134+
"builtin",
135+
"redisCR"
136+
]
143137
}
144138
}
145139
}

0 commit comments

Comments
 (0)