Skip to content
This repository was archived by the owner on Oct 23, 2024. It is now read-only.

Commit 50bc937

Browse files
committed
Upgrade Grafana to 6.4.1
1 parent 6c12085 commit 50bc937

4 files changed

Lines changed: 331 additions & 0 deletions

File tree

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
{
2+
"type": "object",
3+
"properties": {
4+
"service": {
5+
"type": "object",
6+
"description": "DC/OS service configuration properties",
7+
"properties": {
8+
"name": {
9+
"description": "The name of the service instance",
10+
"type": "string",
11+
"default": "grafana",
12+
"title": "Service name"
13+
},
14+
"user": {
15+
"description": "The user that the service will run as.",
16+
"type": "string",
17+
"default": "root",
18+
"title": "User"
19+
},
20+
"service_account": {
21+
"description": "The service account for DC/OS service authentication. This is typically left empty to use the default unless service authentication is needed. The value given here is passed as the principal of Mesos framework.",
22+
"type": "string",
23+
"default": ""
24+
},
25+
"service_account_secret": {
26+
"description": "Name of the Secret Store credentials to use for DC/OS service authentication. This should be left empty unless service authentication is needed.",
27+
"type": "string",
28+
"default": "",
29+
"title": "Credential secret name (optional)"
30+
},
31+
"mesos_api_version": {
32+
"description": "Configures the Mesos API version to use. Possible values: V0 (non-HTTP), V1 (HTTP)",
33+
"type": "string",
34+
"enum": [
35+
"V0",
36+
"V1"
37+
],
38+
"default": "V1"
39+
},
40+
"log_level": {
41+
"description": "The log level for the DC/OS service.",
42+
"type": "string",
43+
"enum": [
44+
"OFF",
45+
"FATAL",
46+
"ERROR",
47+
"WARN",
48+
"INFO",
49+
"DEBUG",
50+
"TRACE",
51+
"ALL"
52+
],
53+
"default": "INFO"
54+
}
55+
},
56+
"required": [
57+
"name",
58+
"user"
59+
]
60+
},
61+
"grafana": {
62+
"description": "grafana pod configuration properties",
63+
"type": "object",
64+
"properties": {
65+
"cpus": {
66+
"description": "Grafana pod CPU requirements",
67+
"type": "number",
68+
"default": 0.2
69+
},
70+
"mem": {
71+
"description": "Grafana pod mem requirements (in MB)",
72+
"type": "integer",
73+
"default": 2048
74+
},
75+
"volume": {
76+
"description": "Grafana volume requirements",
77+
"type": "object",
78+
"properties": {
79+
"path": {
80+
"description": "Location of persistent volume to store data",
81+
"type": "string",
82+
"default": "grafana-data"
83+
},
84+
"type": {
85+
"description": "The type of persistent volume to use, one of ROOT or MOUNT",
86+
"type": "string",
87+
"default": "ROOT",
88+
"enum": [
89+
"ROOT",
90+
"MOUNT",
91+
"PATH"
92+
]
93+
},
94+
"size": {
95+
"description": "The size of the persistent volume in MB",
96+
"type": "integer",
97+
"default": 512,
98+
"minimum": 512
99+
}
100+
}
101+
},
102+
"ini": {
103+
"description": "Base64 encoded conf/grafana.ini",
104+
"type": "string",
105+
"media": {
106+
"binaryEncoding": "base64",
107+
"type": "application/x-yaml"
108+
},
109+
"default": "YXBwX21vZGUgPSBwcm9kdWN0aW9uCmluc3RhbmNlX25hbWUgPSAke0hPU1ROQU1FfQpbcGF0aHNdCmRhdGEgPSAvZ3JhZmFuYS1kYXRhCjt0ZW1wX2RhdGFfbGlmZXRpbWUgPSAyNGgKbG9ncyA9IC9ncmFmYW5hLWRhdGEKcGx1Z2lucyA9IC9ncmFmYW5hLWRhdGEvcGx1Z2lucwpwcm92aXNpb25pbmcgPSBjb25mL3Byb3Zpc2lvbmluZwoK"
110+
},
111+
"provisioning": {
112+
"description": "Provisioning properties to be used",
113+
"type": "object",
114+
"properties": {
115+
"datasources": {
116+
"description": "Base64 encoded conf/provisioning/datasources/datasources.yml",
117+
"type": "string",
118+
"media": {
119+
"binaryEncoding": "base64",
120+
"type": "application/x-yaml"
121+
},
122+
"default": "YXBpVmVyc2lvbjogMQoKI2RlbGV0ZURhdGFzb3VyY2VzOgojICAtIG5hbWU6IFByb21ldGhldXMKIyAgICBvcmdJZDogMQoKI2RhdGFzb3VyY2VzOgojICAtIG5hbWU6IFByb21ldGhldXMKIyAgICB0eXBlOiBwcm9tZXRoZXVzCiMgICAgYWNjZXNzOiBwcm94eQojICAgIG9yZ0lkOiAxCiMgICAgdXJsOiBodHRwOi8vcHJvbWV0aGV1cy5wcm9tZXRoZXVzLmw0bGIudGhpc2Rjb3MuZGlyZWN0b3J5OjkwOTAKIyAgICBpc0RlZmF1bHQ6IHRydWUKIyAgICBqc29uRGF0YTogeyAidGltZUludGVydmFsIjogIjMwcyIgfQo"
123+
},
124+
"dashboards": {
125+
"description": "Base64 encoded conf/provisioning/dashboards/dashboards.yml config",
126+
"type": "string",
127+
"media": {
128+
"binaryEncoding": "base64",
129+
"type": "application/x-yaml"
130+
},
131+
"default": "YXBpVmVyc2lvbjogMQoK"
132+
}
133+
}
134+
}
135+
},
136+
"required": [
137+
"cpus",
138+
"mem"
139+
]
140+
}
141+
}
142+
}
Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
2+
{
3+
"id": "{{service.name}}",
4+
"cpus": 1.0,
5+
"mem": 1024,
6+
"instances": 1,
7+
"user": "{{service.user}}",
8+
"cmd": "export LD_LIBRARY_PATH=$MESOS_SANDBOX/libmesos-bundle/lib:$LD_LIBRARY_PATH; export MESOS_NATIVE_JAVA_LIBRARY=$(ls $MESOS_SANDBOX/libmesos-bundle/lib/libmesos-*.so); export JAVA_HOME=$(ls -d $MESOS_SANDBOX/jdk*/jre/); export JAVA_HOME=${JAVA_HOME%/}; export PATH=$(ls -d $JAVA_HOME/bin):$PATH && export JAVA_OPTS=\"-Xms256M -Xmx512M -XX:-HeapDumpOnOutOfMemoryError\" && ./bootstrap -resolve=false -template=false && ./operator-scheduler/bin/operator svc.yml",
9+
"labels": {
10+
"DCOS_COMMONS_API_VERSION": "v1",
11+
"DCOS_COMMONS_UNINSTALL": "true",
12+
"DCOS_PACKAGE_FRAMEWORK_NAME": "{{service.name}}",
13+
"MARATHON_SINGLE_INSTANCE_APP": "true",
14+
"DCOS_SERVICE_NAME": "{{service.name}}",
15+
"DCOS_SERVICE_PORT_INDEX": "0",
16+
"DCOS_SERVICE_SCHEME": "http"
17+
},
18+
{{#security.secret-name}}
19+
"container": {
20+
"type": "MESOS",
21+
"volumes":[
22+
{
23+
"containerPath": "secrets/service-account.json",
24+
"secret": "serviceCredential"
25+
}
26+
]
27+
},
28+
"secrets": {
29+
"serviceCredential": {
30+
"source": "{{security.secret-name}}"
31+
}
32+
},
33+
{{/security.secret-name}}
34+
"env": {
35+
"PACKAGE_NAME": "{{package-name}}",
36+
"PACKAGE_VERSION": "{{package-version}}",
37+
"PACKAGE_BUILD_TIME_EPOCH_MS": "1531343768523",
38+
"PACKAGE_BUILD_TIME_STR": "2018-07-11T21:16:08.523025",
39+
"FRAMEWORK_NAME": "{{service.name}}",
40+
"FRAMEWORK_USER": "{{service.user}}",
41+
"FRAMEWORK_PRINCIPAL": "{{service.service_account}}",
42+
"FRAMEWORK_LOG_LEVEL": "{{service.log_level}}",
43+
"MESOS_API_VERSION": "{{service.mesos_api_version}}",
44+
45+
"GRAFANA_CPUS": "{{grafana.cpus}}",
46+
"GRAFANA_MEM": "{{grafana.mem}}",
47+
"GRAFANA_VOLUME": "{{grafana.volume.path}}",
48+
"GRAFANA_VOLUME_TYPE": "{{grafana.volume.type}}",
49+
"GRAFANA_VOLUME_SIZE": "{{grafana.volume.size}}",
50+
"GRAFANA_INI": "{{grafana.ini}}",
51+
"GRAFANA_DSP": "{{grafana.provisioning.datasources}}",
52+
"GRAFANA_DBP": "{{grafana.provisioning.dashboards}}",
53+
54+
"NODE_COUNT": "{{node.count}}",
55+
"NODE_PLACEMENT": "{{{node.placement_constraint}}}",
56+
57+
"NODE_CPUS": "{{node.cpus}}",
58+
"NODE_MEM": "{{node.mem}}",
59+
"NODE_DISK": "{{node.disk}}",
60+
"NODE_DISK_TYPE": "{{node.disk_type}}",
61+
62+
"JAVA_URI": "{{resource.assets.uris.jre-tar-gz}}",
63+
"EXECUTOR_URI": "{{resource.assets.uris.executor-zip}}",
64+
"BOOTSTRAP_URI": "{{resource.assets.uris.bootstrap-zip}}",
65+
"GRAFANA_URI": "{{resource.assets.uris.grafana-tar-gz}}",
66+
{{#security.secret-name}}
67+
"DCOS_SERVICE_ACCOUNT_CREDENTIAL": "secrets/service-account.json",
68+
"MESOS_MODULES": "{\"libraries\":[{\"file\":\"libmesos-bundle\/lib\/mesos\/libdcos_security.so\",\"modules\":[{\"name\": \"com_mesosphere_dcos_ClassicRPCAuthenticatee\"},{\"name\":\"com_mesosphere_dcos_http_Authenticatee\",\"parameters\":[{\"key\":\"jwt_exp_timeout\",\"value\":\"5mins\"},{\"key\":\"preemptive_refresh_duration\",\"value\":\"30mins\"}]}]}]}",
69+
"MESOS_AUTHENTICATEE": "com_mesosphere_dcos_ClassicRPCAuthenticatee",
70+
"MESOS_HTTP_AUTHENTICATEE": "com_mesosphere_dcos_http_Authenticatee",
71+
{{/security.secret-name}}
72+
"LIBMESOS_URI": "{{resource.assets.uris.libmesos-bundle-tar-gz}}"
73+
},
74+
"uris": [
75+
"{{resource.assets.uris.bootstrap-zip}}",
76+
"{{resource.assets.uris.jre-tar-gz}}",
77+
"{{resource.assets.uris.scheduler-zip}}",
78+
"{{resource.assets.uris.libmesos-bundle-tar-gz}}",
79+
"{{resource.assets.uris.svc}}"
80+
],
81+
"upgradeStrategy":{
82+
"minimumHealthCapacity": 0,
83+
"maximumOverCapacity": 0
84+
},
85+
"healthChecks": [
86+
{
87+
"protocol": "MESOS_HTTP",
88+
"path": "/v1/health",
89+
"gracePeriodSeconds": 900,
90+
"intervalSeconds": 30,
91+
"portIndex": 0,
92+
"timeoutSeconds": 30,
93+
"maxConsecutiveFailures": 0
94+
}
95+
],
96+
"portDefinitions": [
97+
{
98+
"port": 0,
99+
"protocol": "tcp",
100+
"name": "api",
101+
"labels": { "VIP_0": "/api.{{service.name}}:80" }
102+
}
103+
]
104+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"packagingVersion": "4.0",
3+
"upgradesFrom": [
4+
"*"
5+
],
6+
"downgradesTo": [
7+
"*"
8+
],
9+
"minDcosReleaseVersion": "1.11",
10+
"name": "grafana",
11+
"version": "5.5.0-6.4.1",
12+
"maintainer": "https://dcos.io/community",
13+
"description": "Grafana on DC/OS",
14+
"selected": false,
15+
"framework": true,
16+
"tags": [
17+
"grafana",
18+
"monitoring",
19+
"visualization"
20+
],
21+
"postInstallNotes": "DC/OS Grafana is being installed!",
22+
"postUninstallNotes": "DC/OS Grafana is being uninstalled."
23+
}
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{
2+
"assets": {
3+
"uris": {
4+
"jre-tar-gz": "https://downloads.mesosphere.com/java/server-jre-8u192-linux-x64.tar.gz",
5+
"libmesos-bundle-tar-gz": "https://downloads.mesosphere.com/libmesos-bundle/libmesos-bundle-1.12.0.tar.gz",
6+
"bootstrap-zip": "http://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/bootstrap.zip",
7+
"executor-zip": "http://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/executor.zip",
8+
"scheduler-zip": "https://s3-us-west-1.amazonaws.com/mbgl-bucket/sdk/0.42.1/operator-scheduler.zip",
9+
"svc": "https://s3-us-west-2.amazonaws.com/dcos-objects/grafana/8/svc.yml",
10+
"grafana-tar-gz": "https://dl.grafana.com/oss/release/grafana-6.4.1.linux-amd64.tar.gz"
11+
}
12+
},
13+
"images": {
14+
"icon-small": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-small.png",
15+
"icon-medium": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-medium.png",
16+
"icon-large": "https://downloads.mesosphere.com/assets/universe/000/grafana-icon-large.png",
17+
"screenshots": [
18+
"https://prometheus.io/assets/grafana_prometheus.png",
19+
"https://grafana.com/blog/img/docs/v45/query_inspector.png"
20+
]
21+
},
22+
"cli": {
23+
"binaries": {
24+
"darwin": {
25+
"x86-64": {
26+
"contentHash": [
27+
{
28+
"algo": "sha256",
29+
"value": "c459d2109b31fc0b423f8cacd49df855ef898e63609f7050957f4a0e044d5432"
30+
}
31+
],
32+
"kind": "executable",
33+
"url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/dcos-service-cli-darwin"
34+
}
35+
},
36+
"linux": {
37+
"x86-64": {
38+
"contentHash": [
39+
{
40+
"algo": "sha256",
41+
"value": "e580ee8b71c0c26b1a1a605ca09cbd3528a2c031a8de11519024ccbbce862339"
42+
}
43+
],
44+
"kind": "executable",
45+
"url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/dcos-service-cli-linux"
46+
}
47+
},
48+
"windows": {
49+
"x86-64": {
50+
"contentHash": [
51+
{
52+
"algo": "sha256",
53+
"value": "9135f9456a40cd53e27e73e44fc94c1d4cbf27d9b59f2b47d82bad3ae0f8c714"
54+
}
55+
],
56+
"kind": "executable",
57+
"url": "https://downloads.mesosphere.com/dcos-commons/artifacts/0.42.1/dcos-service-cli.exe"
58+
}
59+
}
60+
}
61+
}
62+
}

0 commit comments

Comments
 (0)