@ydkn/pulumi-components 0.7.15 → 0.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/alpine/deployment.d.ts +3 -0
- package/lib/alpine/deployment.js +6 -1
- package/lib/alpine/deployment.js.map +1 -1
- package/lib/blocky/deployment.d.ts +3 -0
- package/lib/blocky/deployment.js +6 -1
- package/lib/blocky/deployment.js.map +1 -1
- package/lib/cups/deployment.js +2 -3
- package/lib/cups/deployment.js.map +1 -1
- package/lib/freeradius/deployment.d.ts +3 -0
- package/lib/freeradius/deployment.js +6 -1
- package/lib/freeradius/deployment.js.map +1 -1
- package/lib/grafana/alloy.d.ts +5 -0
- package/lib/grafana/alloy.js +124 -3
- package/lib/grafana/alloy.js.map +1 -1
- package/lib/grafana/deployment.d.ts +5 -0
- package/lib/grafana/deployment.js +54 -0
- package/lib/grafana/deployment.js.map +1 -1
- package/lib/k0s/cluster.js +19 -1
- package/lib/k0s/cluster.js.map +1 -1
- package/lib/kubernetes/assets/crashed-cleanup.sh +2 -2
- package/lib/kubernetes/crashedCleanup.js +4 -4
- package/lib/kubernetes/crashedCleanup.js.map +1 -1
- package/lib/kubernetes/v1/index.d.ts +3 -2
- package/lib/kubernetes/v1/index.js +2 -1
- package/lib/kubernetes/v1/index.js.map +1 -1
- package/lib/kubernetes/v1/secureIngress.js.map +1 -0
- package/lib/lldap/deployment.js +1 -2
- package/lib/lldap/deployment.js.map +1 -1
- package/lib/loki/deployment.d.ts +3 -0
- package/lib/loki/deployment.js +2 -0
- package/lib/loki/deployment.js.map +1 -1
- package/lib/metallb/helpers.d.ts +13 -0
- package/lib/metallb/helpers.js +48 -0
- package/lib/metallb/helpers.js.map +1 -0
- package/lib/metallb/index.d.ts +2 -1
- package/lib/metallb/index.js +2 -1
- package/lib/metallb/index.js.map +1 -1
- package/lib/metallb/ipAddressPool.d.ts +4 -0
- package/lib/metallb/ipAddressPool.js.map +1 -1
- package/lib/minio/operator.d.ts +1 -0
- package/lib/minio/operator.js +1 -0
- package/lib/minio/operator.js.map +1 -1
- package/lib/minio/tenant.js +1 -2
- package/lib/minio/tenant.js.map +1 -1
- package/lib/mongodb/cluster.d.ts +3 -0
- package/lib/mongodb/cluster.js +9 -3
- package/lib/mongodb/cluster.js.map +1 -1
- package/lib/mongodb/operator.d.ts +1 -0
- package/lib/mongodb/operator.js +1 -0
- package/lib/mongodb/operator.js.map +1 -1
- package/lib/nats/cluster.d.ts +3 -0
- package/lib/nats/cluster.js +1 -0
- package/lib/nats/cluster.js.map +1 -1
- package/lib/netbird/agent.js +18 -6
- package/lib/netbird/agent.js.map +1 -1
- package/lib/netbird/assets/nftables.sh +6 -6
- package/lib/netbird/management.d.ts +1 -1
- package/lib/netbird/management.js +29 -9
- package/lib/netbird/management.js.map +1 -1
- package/lib/plex/mediaServer.d.ts +4 -0
- package/lib/plex/mediaServer.js +7 -1
- package/lib/plex/mediaServer.js.map +1 -1
- package/lib/postgresql/cluster.d.ts +6 -1
- package/lib/postgresql/cluster.js +3 -1
- package/lib/postgresql/cluster.js.map +1 -1
- package/lib/postgresql/operator.d.ts +0 -1
- package/lib/postgresql/operator.js.map +1 -1
- package/lib/prometheus/operator.js +2 -1
- package/lib/prometheus/operator.js.map +1 -1
- package/lib/proxy/deployment.d.ts +3 -0
- package/lib/proxy/deployment.js +6 -1
- package/lib/proxy/deployment.js.map +1 -1
- package/lib/rook/cluster.d.ts +1 -0
- package/lib/rook/cluster.js +1 -1
- package/lib/rook/cluster.js.map +1 -1
- package/lib/samba/dc.d.ts +3 -0
- package/lib/samba/dc.js +6 -1
- package/lib/samba/dc.js.map +1 -1
- package/lib/samba/deployment.d.ts +6 -0
- package/lib/samba/deployment.js +45 -1
- package/lib/samba/deployment.js.map +1 -1
- package/lib/torproxy/deployment.d.ts +3 -0
- package/lib/torproxy/deployment.js +6 -1
- package/lib/torproxy/deployment.js.map +1 -1
- package/lib/traefik/controller.d.ts +6 -1
- package/lib/traefik/controller.js +4 -0
- package/lib/traefik/controller.js.map +1 -1
- package/lib/traefik/index.d.ts +1 -2
- package/lib/traefik/index.js +1 -2
- package/lib/traefik/index.js.map +1 -1
- package/lib/transmission/deployment.js +2 -2
- package/lib/transmission/deployment.js.map +1 -1
- package/lib/ubuntu/deployment.d.ts +3 -0
- package/lib/ubuntu/deployment.js +6 -1
- package/lib/ubuntu/deployment.js.map +1 -1
- package/lib/unifi/assets/init-mongo.sh +19 -0
- package/lib/unifi/index.d.ts +2 -2
- package/lib/unifi/index.js +2 -2
- package/lib/unifi/index.js.map +1 -1
- package/lib/unifi/{controller.d.ts → networkServer.d.ts} +17 -6
- package/lib/unifi/{controller.js → networkServer.js} +110 -26
- package/lib/unifi/networkServer.js.map +1 -0
- package/lib/wireguard/deployment.js +9 -2
- package/lib/wireguard/deployment.js.map +1 -1
- package/package.json +16 -16
- package/lib/traefik/secureIngress.js.map +0 -1
- package/lib/unifi/controller.js.map +0 -1
- /package/lib/{traefik → kubernetes/v1}/secureIngress.d.ts +0 -0
- /package/lib/{traefik → kubernetes/v1}/secureIngress.js +0 -0
|
@@ -27,6 +27,9 @@ export interface AlpineArgs {
|
|
|
27
27
|
nodeSelector?: pulumi.Input<Record<string, pulumi.Input<string>>>;
|
|
28
28
|
replicas?: pulumi.Input<number>;
|
|
29
29
|
serviceType?: pulumi.Input<string>;
|
|
30
|
+
serviceLabels?: pulumi.Input<{
|
|
31
|
+
[key: string]: pulumi.Input<string>;
|
|
32
|
+
}>;
|
|
30
33
|
serviceLoadBalancerClass?: pulumi.Input<string>;
|
|
31
34
|
hostNetwork?: pulumi.Input<boolean>;
|
|
32
35
|
resources?: pulumi.Input<k8s.types.input.core.v1.ResourceRequirements>;
|
package/lib/alpine/deployment.js
CHANGED
|
@@ -291,7 +291,12 @@ export class Alpine extends ComponentResource {
|
|
|
291
291
|
},
|
|
292
292
|
}, k8sOpts);
|
|
293
293
|
this.service = new kubernetes.v1.Service(name, {
|
|
294
|
-
metadata
|
|
294
|
+
metadata: {
|
|
295
|
+
...metadata,
|
|
296
|
+
labels: pulumi.all([args.serviceLabels]).apply(([labels]) => {
|
|
297
|
+
return { ...metadata.labels, ...labels };
|
|
298
|
+
}),
|
|
299
|
+
},
|
|
295
300
|
spec: {
|
|
296
301
|
loadBalancerClass: args.serviceLoadBalancerClass,
|
|
297
302
|
type: args.serviceType ?? "ClusterIP",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/alpine/deployment.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/alpine/deployment.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,9 @@ export interface BlockyArgs {
|
|
|
11
11
|
redis?: pulumi.Input<RedisArgs>;
|
|
12
12
|
hostname?: pulumi.Input<string>;
|
|
13
13
|
serviceType?: pulumi.Input<string>;
|
|
14
|
+
serviceLabels?: pulumi.Input<{
|
|
15
|
+
[key: string]: pulumi.Input<string>;
|
|
16
|
+
}>;
|
|
14
17
|
serviceLoadBalancerClass?: pulumi.Input<string>;
|
|
15
18
|
replicas?: pulumi.Input<number>;
|
|
16
19
|
}
|
package/lib/blocky/deployment.js
CHANGED
|
@@ -149,7 +149,12 @@ export class Blocky extends ComponentResource {
|
|
|
149
149
|
},
|
|
150
150
|
}, k8sOpts);
|
|
151
151
|
this.service = new kubernetes.v1.Service(name, {
|
|
152
|
-
metadata
|
|
152
|
+
metadata: {
|
|
153
|
+
...metadata,
|
|
154
|
+
labels: pulumi.all([args.serviceLabels]).apply(([labels]) => {
|
|
155
|
+
return { ...metadata.labels, ...labels };
|
|
156
|
+
}),
|
|
157
|
+
},
|
|
153
158
|
spec: {
|
|
154
159
|
loadBalancerClass: args.serviceLoadBalancerClass,
|
|
155
160
|
type: args.serviceType ?? "ClusterIP",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/blocky/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,KAAK,IAAI,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/blocky/deployment.ts"],"names":[],"mappings":"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"}
|
package/lib/cups/deployment.js
CHANGED
|
@@ -3,7 +3,6 @@ import * as random from "@pulumi/random";
|
|
|
3
3
|
import * as k8s from "@pulumi/kubernetes";
|
|
4
4
|
import { ComponentResource } from "../common/index.js";
|
|
5
5
|
import * as kubernetes from "../kubernetes/index.js";
|
|
6
|
-
import { SecureIngress } from "../traefik/index.js";
|
|
7
6
|
import { AvahiService } from "./avahiService.js";
|
|
8
7
|
export class Cups extends ComponentResource {
|
|
9
8
|
adminSecret;
|
|
@@ -75,7 +74,7 @@ export class Cups extends ComponentResource {
|
|
|
75
74
|
},
|
|
76
75
|
],
|
|
77
76
|
volumeMounts: [{ name: "data", mountPath: "/etc/cups" }],
|
|
78
|
-
ports: [{ name: "cups", containerPort: 631 }],
|
|
77
|
+
ports: [{ name: "cups", containerPort: 631, hostPort: 631 }],
|
|
79
78
|
resources: {
|
|
80
79
|
requests: { memory: "128Mi" },
|
|
81
80
|
limits: { memory: "192Mi" },
|
|
@@ -94,7 +93,7 @@ export class Cups extends ComponentResource {
|
|
|
94
93
|
ports: [{ name: "https", port: 631, targetPort: "cups" }],
|
|
95
94
|
},
|
|
96
95
|
}, { ...k8sOpts, dependsOn: [this.deployment] });
|
|
97
|
-
this.ingress = new SecureIngress(name, {
|
|
96
|
+
this.ingress = new kubernetes.v1.SecureIngress(name, {
|
|
98
97
|
metadata,
|
|
99
98
|
spec: {
|
|
100
99
|
ingressClassName: args.ingressClassName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/cups/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/cups/deployment.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,9 @@ export interface FreeRadiusServerArgs {
|
|
|
13
13
|
domain: pulumi.Input<string>;
|
|
14
14
|
ldap: pulumi.Input<LdapArgs>;
|
|
15
15
|
serviceType?: pulumi.Input<string>;
|
|
16
|
+
serviceLabels?: pulumi.Input<{
|
|
17
|
+
[key: string]: pulumi.Input<string>;
|
|
18
|
+
}>;
|
|
16
19
|
serviceLoadBalancerClass?: pulumi.Input<string>;
|
|
17
20
|
resources?: pulumi.Input<k8s.types.input.core.v1.ResourceRequirements>;
|
|
18
21
|
protect?: boolean;
|
|
@@ -154,7 +154,12 @@ export class FreeRadiusServer extends ComponentResource {
|
|
|
154
154
|
},
|
|
155
155
|
}, k8sOpts);
|
|
156
156
|
this.service = new kubernetes.v1.Service(name, {
|
|
157
|
-
metadata
|
|
157
|
+
metadata: {
|
|
158
|
+
...metadata,
|
|
159
|
+
labels: pulumi.all([args.serviceLabels]).apply(([labels]) => {
|
|
160
|
+
return { ...metadata.labels, ...labels };
|
|
161
|
+
}),
|
|
162
|
+
},
|
|
158
163
|
spec: {
|
|
159
164
|
loadBalancerClass: args.serviceLoadBalancerClass,
|
|
160
165
|
type: args.serviceType ?? "ClusterIP",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/freeradius/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,QAAQ,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/freeradius/deployment.ts"],"names":[],"mappings":"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"}
|
package/lib/grafana/alloy.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import * as pulumi from "@pulumi/pulumi";
|
|
2
2
|
import * as k8s from "@pulumi/kubernetes";
|
|
3
3
|
import { ComponentResource } from "../common/index.js";
|
|
4
|
+
import { Node } from "../node/index.js";
|
|
4
5
|
export interface PrometheusArgs {
|
|
5
6
|
url: pulumi.Input<string>;
|
|
6
7
|
username?: pulumi.Input<string>;
|
|
@@ -22,12 +23,16 @@ export interface AlloyArgs {
|
|
|
22
23
|
clusterIssuer?: pulumi.Input<string>;
|
|
23
24
|
resources?: pulumi.Input<k8s.types.input.core.v1.ResourceRequirements>;
|
|
24
25
|
installPrometheusCRDs?: pulumi.Input<boolean>;
|
|
26
|
+
nodes: pulumi.Input<pulumi.Input<Node>[]>;
|
|
25
27
|
}
|
|
26
28
|
export declare class Alloy extends ComponentResource {
|
|
27
29
|
private readonly prometheusCRDsRelease;
|
|
28
30
|
private readonly prometheusSecret;
|
|
29
31
|
private readonly lokiSecret;
|
|
30
32
|
private readonly helmRelease;
|
|
33
|
+
private readonly kubeletService;
|
|
34
|
+
private readonly kubeletEndpoints;
|
|
35
|
+
private readonly kubeletServiceMonitor;
|
|
31
36
|
readonly namespace: pulumi.Output<string>;
|
|
32
37
|
/**
|
|
33
38
|
* Create a new grafana alloy resource.
|
package/lib/grafana/alloy.js
CHANGED
|
@@ -2,11 +2,15 @@ import * as pulumi from "@pulumi/pulumi";
|
|
|
2
2
|
import * as k8s from "@pulumi/kubernetes";
|
|
3
3
|
import { ComponentResource } from "../common/index.js";
|
|
4
4
|
import * as kubernetes from "../kubernetes/index.js";
|
|
5
|
+
import * as prometheus from "../prometheus/index.js";
|
|
5
6
|
export class Alloy extends ComponentResource {
|
|
6
7
|
prometheusCRDsRelease;
|
|
7
8
|
prometheusSecret;
|
|
8
9
|
lokiSecret;
|
|
9
10
|
helmRelease;
|
|
11
|
+
kubeletService;
|
|
12
|
+
kubeletEndpoints;
|
|
13
|
+
kubeletServiceMonitor;
|
|
10
14
|
namespace;
|
|
11
15
|
/**
|
|
12
16
|
* Create a new grafana alloy resource.
|
|
@@ -21,8 +25,8 @@ export class Alloy extends ComponentResource {
|
|
|
21
25
|
}
|
|
22
26
|
if (args.resources === undefined) {
|
|
23
27
|
args.resources = {
|
|
24
|
-
requests: { memory: "
|
|
25
|
-
limits: { memory: "
|
|
28
|
+
requests: { memory: "384Mi" },
|
|
29
|
+
limits: { memory: "512Mi" },
|
|
26
30
|
};
|
|
27
31
|
}
|
|
28
32
|
if (args.installPrometheusCRDs === undefined) {
|
|
@@ -127,7 +131,7 @@ export class Alloy extends ComponentResource {
|
|
|
127
131
|
serviceMonitor: { enabled: true },
|
|
128
132
|
ingress: {
|
|
129
133
|
enabled: args.hostname ?? false,
|
|
130
|
-
ingressClassName: args.ingressClassName ?? "
|
|
134
|
+
ingressClassName: args.ingressClassName ?? "cilium",
|
|
131
135
|
annotations: {
|
|
132
136
|
"cert-manager.io/cluster-issuer": args.clusterIssuer ?? "letsencrypt",
|
|
133
137
|
"traefik.ingress.kubernetes.io/router.entrypoints": "websecure",
|
|
@@ -139,6 +143,123 @@ export class Alloy extends ComponentResource {
|
|
|
139
143
|
},
|
|
140
144
|
},
|
|
141
145
|
}, k8sOpts);
|
|
146
|
+
const kubeletMetadata = {
|
|
147
|
+
name: "kubelet",
|
|
148
|
+
namespace: this.namespace,
|
|
149
|
+
labels: {
|
|
150
|
+
"app.kubernetes.io/name": "kubelet",
|
|
151
|
+
},
|
|
152
|
+
};
|
|
153
|
+
this.kubeletService = new k8s.core.v1.Service("kubelet", {
|
|
154
|
+
metadata: kubeletMetadata,
|
|
155
|
+
spec: {
|
|
156
|
+
clusterIP: "None",
|
|
157
|
+
ipFamilyPolicy: "RequireDualStack",
|
|
158
|
+
ports: [{ name: "https-metrics", port: 10250, targetPort: 10250, protocol: "TCP" }],
|
|
159
|
+
},
|
|
160
|
+
}, k8sOpts);
|
|
161
|
+
this.kubeletEndpoints = new k8s.core.v1.Endpoints("kubelet", {
|
|
162
|
+
metadata: kubeletMetadata,
|
|
163
|
+
subsets: [
|
|
164
|
+
{
|
|
165
|
+
addresses: pulumi.all([args.nodes]).apply(([nodes]) => nodes.map((node) => ({
|
|
166
|
+
ip: node.privateIpv4Address ?? node.ipv4Address,
|
|
167
|
+
targetRef: { kind: "Node", name: node.hostname },
|
|
168
|
+
}))),
|
|
169
|
+
ports: [{ name: "https-metrics", port: 10250, protocol: "TCP" }],
|
|
170
|
+
},
|
|
171
|
+
],
|
|
172
|
+
}, { ...k8sOpts, dependsOn: this.kubeletService });
|
|
173
|
+
this.kubeletServiceMonitor = new prometheus.ServiceMonitor(`${name}-kubelet`, {
|
|
174
|
+
metadata: kubeletMetadata,
|
|
175
|
+
spec: {
|
|
176
|
+
endpoints: [
|
|
177
|
+
{
|
|
178
|
+
bearerTokenFile: "/var/run/secrets/kubernetes.io/serviceaccount/token",
|
|
179
|
+
honorLabels: true,
|
|
180
|
+
interval: "60s",
|
|
181
|
+
port: "https-metrics",
|
|
182
|
+
scheme: "https",
|
|
183
|
+
tlsConfig: { insecureSkipVerify: true },
|
|
184
|
+
relabelings: [{ sourceLabels: ["__metrics_path__"], targetLabel: "metrics_path" }],
|
|
185
|
+
},
|
|
186
|
+
{
|
|
187
|
+
bearerTokenFile: "/var/run/secrets/kubernetes.io/serviceaccount/token",
|
|
188
|
+
honorLabels: true,
|
|
189
|
+
honorTimestamps: false,
|
|
190
|
+
interval: "60s",
|
|
191
|
+
path: "/metrics/cadvisor",
|
|
192
|
+
port: "https-metrics",
|
|
193
|
+
scheme: "https",
|
|
194
|
+
tlsConfig: { insecureSkipVerify: true },
|
|
195
|
+
metricRelabelings: [
|
|
196
|
+
{
|
|
197
|
+
action: "drop",
|
|
198
|
+
sourceLabels: ["__name__"],
|
|
199
|
+
regex: "go_.*",
|
|
200
|
+
},
|
|
201
|
+
{
|
|
202
|
+
action: "drop",
|
|
203
|
+
sourceLabels: ["__name__"],
|
|
204
|
+
regex: [
|
|
205
|
+
"container_cpu_cfs_throttled_seconds_total",
|
|
206
|
+
"container_cpu_load_average_10s",
|
|
207
|
+
"container_cpu_system_seconds_total",
|
|
208
|
+
"container_cpu_user_seconds_total",
|
|
209
|
+
].join("|"),
|
|
210
|
+
},
|
|
211
|
+
{
|
|
212
|
+
action: "drop",
|
|
213
|
+
sourceLabels: ["__name__"],
|
|
214
|
+
regex: [
|
|
215
|
+
"container_fs_io_current",
|
|
216
|
+
"container_fs_io_time_seconds_total",
|
|
217
|
+
"container_fs_io_time_weighted_seconds_total",
|
|
218
|
+
"container_fs_reads_merged_total",
|
|
219
|
+
"container_fs_sector_reads_total",
|
|
220
|
+
"container_fs_sector_writes_total",
|
|
221
|
+
"container_fs_writes_merged_total",
|
|
222
|
+
].join("|"),
|
|
223
|
+
},
|
|
224
|
+
{
|
|
225
|
+
action: "drop",
|
|
226
|
+
sourceLabels: ["__name__"],
|
|
227
|
+
regex: ["container_memory_mapped_file", "container_memory_swap"].join("|"),
|
|
228
|
+
},
|
|
229
|
+
{
|
|
230
|
+
action: "drop",
|
|
231
|
+
sourceLabels: ["__name__"],
|
|
232
|
+
regex: ["container_file_descriptors", "container_tasks_state", "container_threads_max"].join("|"),
|
|
233
|
+
},
|
|
234
|
+
{
|
|
235
|
+
action: "drop",
|
|
236
|
+
sourceLabels: ["__name__"],
|
|
237
|
+
regex: "container_spec.*",
|
|
238
|
+
},
|
|
239
|
+
{
|
|
240
|
+
action: "drop",
|
|
241
|
+
sourceLabels: ["id", "pod"],
|
|
242
|
+
regex: ".+;",
|
|
243
|
+
},
|
|
244
|
+
],
|
|
245
|
+
relabelings: [{ sourceLabels: ["__metrics_path__"], targetLabel: "metrics_path" }],
|
|
246
|
+
},
|
|
247
|
+
{
|
|
248
|
+
bearerTokenFile: "/var/run/secrets/kubernetes.io/serviceaccount/token",
|
|
249
|
+
honorLabels: true,
|
|
250
|
+
honorTimestamps: false,
|
|
251
|
+
interval: "60s",
|
|
252
|
+
path: "/metrics/probes",
|
|
253
|
+
port: "https-metrics",
|
|
254
|
+
scheme: "https",
|
|
255
|
+
tlsConfig: { insecureSkipVerify: true },
|
|
256
|
+
relabelings: [{ sourceLabels: ["__metrics_path__"], targetLabel: "metrics_path" }],
|
|
257
|
+
},
|
|
258
|
+
],
|
|
259
|
+
namespaceSelector: { matchNames: [this.namespace] },
|
|
260
|
+
selector: { matchLabels: kubeletMetadata.labels },
|
|
261
|
+
},
|
|
262
|
+
}, { ...k8sOpts, dependsOn: this.kubeletEndpoints });
|
|
142
263
|
this.registerOutputs();
|
|
143
264
|
}
|
|
144
265
|
}
|
package/lib/grafana/alloy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"alloy.js","sourceRoot":"","sources":["../../../lib/grafana/alloy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"alloy.js","sourceRoot":"","sources":["../../../lib/grafana/alloy.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,8 @@ export interface GrafanaArgs {
|
|
|
15
15
|
replicas?: pulumi.Input<number>;
|
|
16
16
|
}
|
|
17
17
|
export declare class Grafana extends ComponentResource {
|
|
18
|
+
private static readonly kubernetesDashboards;
|
|
19
|
+
private static readonly cephDashboards;
|
|
18
20
|
private readonly helmRelease;
|
|
19
21
|
readonly adminPassword: pulumi.Output<string>;
|
|
20
22
|
readonly namespace: pulumi.Output<string>;
|
|
@@ -25,4 +27,7 @@ export declare class Grafana extends ComponentResource {
|
|
|
25
27
|
* @param opts A bag of options that control this resource's behavior.
|
|
26
28
|
*/
|
|
27
29
|
constructor(name: string, args: GrafanaArgs, opts?: pulumi.ComponentResourceOptions);
|
|
30
|
+
private dashboard;
|
|
31
|
+
private kubernetesDashboard;
|
|
32
|
+
private cephDashboard;
|
|
28
33
|
}
|
|
@@ -3,7 +3,27 @@ import * as random from "@pulumi/random";
|
|
|
3
3
|
import * as k8s from "@pulumi/kubernetes";
|
|
4
4
|
import { ComponentResource } from "../common/index.js";
|
|
5
5
|
import * as kubernetes from "../kubernetes/index.js";
|
|
6
|
+
import { Dashboard } from "./dashboard.js";
|
|
7
|
+
import * as https from "https";
|
|
6
8
|
export class Grafana extends ComponentResource {
|
|
9
|
+
static kubernetesDashboards = [
|
|
10
|
+
"k8s-system-coredns",
|
|
11
|
+
"k8s-views-global",
|
|
12
|
+
"k8s-views-namespaces",
|
|
13
|
+
"k8s-views-nodes",
|
|
14
|
+
"k8s-views-pods",
|
|
15
|
+
];
|
|
16
|
+
static cephDashboards = [
|
|
17
|
+
"ceph-cluster",
|
|
18
|
+
"ceph-cluster-advanced",
|
|
19
|
+
"hosts-overview",
|
|
20
|
+
"host-details",
|
|
21
|
+
"osds-overview",
|
|
22
|
+
"osd-device-details",
|
|
23
|
+
"pool-overview",
|
|
24
|
+
"pool-detail",
|
|
25
|
+
"cephfs-overview",
|
|
26
|
+
];
|
|
7
27
|
helmRelease;
|
|
8
28
|
adminPassword;
|
|
9
29
|
namespace;
|
|
@@ -87,7 +107,41 @@ export class Grafana extends ComponentResource {
|
|
|
87
107
|
},
|
|
88
108
|
},
|
|
89
109
|
}, k8sOpts);
|
|
110
|
+
for (const id of Grafana.kubernetesDashboards) {
|
|
111
|
+
this.kubernetesDashboard(name, this.namespace, id, k8sOpts);
|
|
112
|
+
}
|
|
113
|
+
for (const id of Grafana.cephDashboards) {
|
|
114
|
+
this.cephDashboard(name, this.namespace, id, k8sOpts);
|
|
115
|
+
}
|
|
90
116
|
this.registerOutputs();
|
|
91
117
|
}
|
|
118
|
+
dashboard(name, namespace, id, url, opts) {
|
|
119
|
+
return new Dashboard(`${name}-grafana-dashboard-${id}`, {
|
|
120
|
+
metadata: { name: pulumi.interpolate `${name}-grafana-dashboard-${id}`, namespace },
|
|
121
|
+
name: id,
|
|
122
|
+
data: new Promise((resolve, reject) => {
|
|
123
|
+
https
|
|
124
|
+
.request(url, (r) => {
|
|
125
|
+
let data = "";
|
|
126
|
+
r.on("data", (chunk) => {
|
|
127
|
+
data += chunk;
|
|
128
|
+
});
|
|
129
|
+
r.on("end", () => {
|
|
130
|
+
resolve(data);
|
|
131
|
+
});
|
|
132
|
+
r.on("error", (err) => {
|
|
133
|
+
reject(err);
|
|
134
|
+
});
|
|
135
|
+
})
|
|
136
|
+
.end();
|
|
137
|
+
}),
|
|
138
|
+
}, opts);
|
|
139
|
+
}
|
|
140
|
+
kubernetesDashboard(name, namespace, id, opts) {
|
|
141
|
+
return this.dashboard(name, namespace, id, `https://raw.githubusercontent.com/dotdc/grafana-dashboards-kubernetes/master/dashboards/${id}.json`, opts);
|
|
142
|
+
}
|
|
143
|
+
cephDashboard(name, namespace, id, opts) {
|
|
144
|
+
return this.dashboard(name, namespace, id, `https://raw.githubusercontent.com/ceph/ceph/refs/heads/main/monitoring/ceph-mixin/dashboards_out/${id}.json`, opts);
|
|
145
|
+
}
|
|
92
146
|
}
|
|
93
147
|
//# sourceMappingURL=deployment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/grafana/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,MAAM,MAAM,gBAAgB,CAAC;AACzC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/grafana/deployment.ts"],"names":[],"mappings":"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"}
|
package/lib/k0s/cluster.js
CHANGED
|
@@ -87,7 +87,25 @@ export class Cluster extends ComponentResource {
|
|
|
87
87
|
}
|
|
88
88
|
return Cluster.k0sNode(node, installFlags, node.privateKey, hooks, noTaints);
|
|
89
89
|
}),
|
|
90
|
-
k0s
|
|
90
|
+
k0s: pulumi.all([k0s]).apply(([k0s]) => {
|
|
91
|
+
if (k0s === undefined) {
|
|
92
|
+
k0s = {};
|
|
93
|
+
}
|
|
94
|
+
if (k0s.config === undefined) {
|
|
95
|
+
k0s.config = {};
|
|
96
|
+
}
|
|
97
|
+
if (k0s.config.spec === undefined) {
|
|
98
|
+
k0s.config.spec = {};
|
|
99
|
+
}
|
|
100
|
+
if (k0s.config.spec.network === undefined) {
|
|
101
|
+
k0s.config.spec.network = {};
|
|
102
|
+
}
|
|
103
|
+
if (k0s.config.spec.network.kubeProxy === undefined) {
|
|
104
|
+
k0s.config.spec.network.kubeProxy = {};
|
|
105
|
+
}
|
|
106
|
+
k0s.config.spec.network.kubeProxy.mode = "nftables";
|
|
107
|
+
return k0s;
|
|
108
|
+
}),
|
|
91
109
|
};
|
|
92
110
|
}),
|
|
93
111
|
}, { ...emptyOpts, provider: this.clusterProvider });
|