@pulumiverse/grafana 0.7.0 → 0.7.1
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/alerting/contactPoint.d.ts +1 -1
- package/alerting/contactPoint.js +1 -1
- package/alerting/messageTemplate.d.ts +2 -2
- package/alerting/messageTemplate.js +2 -2
- package/alerting/muteTiming.d.ts +2 -2
- package/alerting/muteTiming.js +2 -2
- package/alerting/notificationPolicy.d.ts +2 -2
- package/alerting/notificationPolicy.js +2 -2
- package/alerting/ruleGroup.d.ts +1 -1
- package/alerting/ruleGroup.js +1 -1
- package/cloud/getAccessPolicies.d.ts +50 -0
- package/cloud/getAccessPolicies.js +46 -0
- package/cloud/getAccessPolicies.js.map +1 -0
- package/cloud/getProviderAwsAccount.d.ts +92 -0
- package/cloud/getProviderAwsAccount.js +74 -0
- package/cloud/getProviderAwsAccount.js.map +1 -0
- package/cloud/getProviderAwsCloudwatchScrapeJob.d.ts +211 -0
- package/cloud/getProviderAwsCloudwatchScrapeJob.js +160 -0
- package/cloud/getProviderAwsCloudwatchScrapeJob.js.map +1 -0
- package/cloud/getProviderAwsCloudwatchScrapeJobs.d.ts +66 -0
- package/cloud/getProviderAwsCloudwatchScrapeJobs.js +54 -0
- package/cloud/getProviderAwsCloudwatchScrapeJobs.js.map +1 -0
- package/cloud/index.d.ts +18 -0
- package/cloud/index.js +23 -1
- package/cloud/index.js.map +1 -1
- package/cloud/providerAwsAccount.d.ts +103 -0
- package/cloud/providerAwsAccount.js +96 -0
- package/cloud/providerAwsAccount.js.map +1 -0
- package/cloud/providerAwsCloudwatchScrapeJob.d.ts +192 -0
- package/cloud/providerAwsCloudwatchScrapeJob.js +139 -0
- package/cloud/providerAwsCloudwatchScrapeJob.js.map +1 -0
- package/config/vars.d.ts +19 -0
- package/config/vars.js +24 -0
- package/config/vars.js.map +1 -1
- package/connectionsMetricsEndpointScrapeJob.d.ts +151 -0
- package/connectionsMetricsEndpointScrapeJob.js +101 -0
- package/connectionsMetricsEndpointScrapeJob.js.map +1 -0
- package/contactPoint.d.ts +1 -1
- package/contactPoint.js +1 -1
- package/dashboardPermissionItem.d.ts +3 -3
- package/dataSource.d.ts +9 -0
- package/dataSource.js +9 -0
- package/dataSource.js.map +1 -1
- package/dataSourcePermissionItem.d.ts +3 -3
- package/enterprise/dataSourcePermissionItem.d.ts +3 -3
- package/enterprise/roleAssignmentItem.d.ts +3 -3
- package/folderPermissionItem.d.ts +3 -3
- package/getConnectionsMetricsEndpointScrapeJob.d.ts +79 -0
- package/getConnectionsMetricsEndpointScrapeJob.js +50 -0
- package/getConnectionsMetricsEndpointScrapeJob.js.map +1 -0
- package/getLibraryPanels.d.ts +114 -0
- package/getLibraryPanels.js +102 -0
- package/getLibraryPanels.js.map +1 -0
- package/getOncallUser.d.ts +1 -1
- package/getTeam.d.ts +1 -0
- package/getTeam.js.map +1 -1
- package/getUser.d.ts +2 -0
- package/getUser.js +2 -0
- package/getUser.js.map +1 -1
- package/getUsers.d.ts +2 -0
- package/getUsers.js +2 -0
- package/getUsers.js.map +1 -1
- package/index.d.ts +9 -0
- package/index.js +14 -3
- package/index.js.map +1 -1
- package/machineLearningHoliday.d.ts +42 -0
- package/machineLearningHoliday.js +42 -0
- package/machineLearningHoliday.js.map +1 -1
- package/machineLearningJob.d.ts +137 -9
- package/machineLearningJob.js +125 -0
- package/machineLearningJob.js.map +1 -1
- package/machineLearningOutlierDetector.d.ts +64 -6
- package/machineLearningOutlierDetector.js +55 -0
- package/machineLearningOutlierDetector.js.map +1 -1
- package/machinelearning/alert.d.ts +236 -0
- package/machinelearning/alert.js +138 -0
- package/machinelearning/alert.js.map +1 -0
- package/machinelearning/holiday.d.ts +42 -0
- package/machinelearning/holiday.js +42 -0
- package/machinelearning/holiday.js.map +1 -1
- package/machinelearning/index.d.ts +3 -0
- package/machinelearning/index.js +6 -1
- package/machinelearning/index.js.map +1 -1
- package/machinelearning/job.d.ts +137 -9
- package/machinelearning/job.js +125 -0
- package/machinelearning/job.js.map +1 -1
- package/machinelearning/outlierDetector.d.ts +64 -6
- package/machinelearning/outlierDetector.js +55 -0
- package/machinelearning/outlierDetector.js.map +1 -1
- package/messageTemplate.d.ts +2 -2
- package/messageTemplate.js +2 -2
- package/muteTiming.d.ts +2 -2
- package/muteTiming.js +2 -2
- package/notificationPolicy.d.ts +2 -2
- package/notificationPolicy.js +2 -2
- package/oncall/escalation.d.ts +18 -6
- package/oncall/escalation.js +2 -0
- package/oncall/escalation.js.map +1 -1
- package/oncall/getUser.d.ts +1 -1
- package/oncall/getUsers.d.ts +20 -0
- package/oncall/getUsers.js +24 -0
- package/oncall/getUsers.js.map +1 -0
- package/oncall/index.d.ts +3 -0
- package/oncall/index.js +4 -1
- package/oncall/index.js.map +1 -1
- package/oncall/integration.d.ts +1 -1
- package/oncall/integration.js +1 -1
- package/oncall/onCallShift.d.ts +12 -0
- package/oncall/onCallShift.js +2 -0
- package/oncall/onCallShift.js.map +1 -1
- package/oncallEscalation.d.ts +18 -6
- package/oncallEscalation.js +2 -0
- package/oncallEscalation.js.map +1 -1
- package/oncallIntegration.d.ts +1 -1
- package/oncallIntegration.js +1 -1
- package/oncallOnCallShift.d.ts +12 -0
- package/oncallOnCallShift.js +2 -0
- package/oncallOnCallShift.js.map +1 -1
- package/organization.d.ts +1 -0
- package/organization.js +1 -0
- package/organization.js.map +1 -1
- package/oss/dashboardPermissionItem.d.ts +3 -3
- package/oss/dataSource.d.ts +9 -0
- package/oss/dataSource.js +9 -0
- package/oss/dataSource.js.map +1 -1
- package/oss/folderPermissionItem.d.ts +3 -3
- package/oss/getTeam.d.ts +1 -0
- package/oss/getTeam.js.map +1 -1
- package/oss/getUser.d.ts +2 -0
- package/oss/getUser.js +2 -0
- package/oss/getUser.js.map +1 -1
- package/oss/getUsers.d.ts +2 -0
- package/oss/getUsers.js +2 -0
- package/oss/getUsers.js.map +1 -1
- package/oss/organization.d.ts +1 -0
- package/oss/organization.js +1 -0
- package/oss/organization.js.map +1 -1
- package/oss/serviceAccountPermissionItem.d.ts +3 -3
- package/oss/ssoSettings.d.ts +56 -4
- package/oss/ssoSettings.js +43 -1
- package/oss/ssoSettings.js.map +1 -1
- package/oss/team.d.ts +8 -0
- package/oss/team.js +2 -0
- package/oss/team.js.map +1 -1
- package/oss/user.d.ts +1 -0
- package/oss/user.js +1 -0
- package/oss/user.js.map +1 -1
- package/package.json +2 -2
- package/provider.d.ts +38 -0
- package/provider.js +5 -1
- package/provider.js.map +1 -1
- package/roleAssignmentItem.d.ts +3 -3
- package/ruleGroup.d.ts +1 -1
- package/ruleGroup.js +1 -1
- package/serviceAccountPermissionItem.d.ts +3 -3
- package/slo/slo.d.ts +14 -2
- package/slo/slo.js +5 -0
- package/slo/slo.js.map +1 -1
- package/slo.d.ts +14 -2
- package/slo.js +5 -0
- package/slo.js.map +1 -1
- package/ssoSettings.d.ts +56 -4
- package/ssoSettings.js +43 -1
- package/ssoSettings.js.map +1 -1
- package/team.d.ts +8 -0
- package/team.js +2 -0
- package/team.js.map +1 -1
- package/types/input.d.ts +894 -10
- package/types/output.d.ts +837 -14
- package/user.d.ts +1 -0
- package/user.js +1 -0
- package/user.js.map +1 -1
package/oss/ssoSettings.js
CHANGED
|
@@ -6,7 +6,7 @@ exports.SsoSettings = void 0;
|
|
|
6
6
|
const pulumi = require("@pulumi/pulumi");
|
|
7
7
|
const utilities = require("../utilities");
|
|
8
8
|
/**
|
|
9
|
-
* Manages Grafana SSO Settings for OAuth2 and
|
|
9
|
+
* Manages Grafana SSO Settings for OAuth2, SAML and LDAP. Support for LDAP is currently in preview, it will be available in Grafana starting with v11.3.
|
|
10
10
|
*
|
|
11
11
|
* * [Official documentation](https://grafana.com/docs/grafana/latest/setup-grafana/configure-security/configure-authentication/)
|
|
12
12
|
* * [HTTP API](https://grafana.com/docs/grafana/latest/developers/http_api/sso-settings/)
|
|
@@ -63,6 +63,46 @@ const utilities = require("../utilities");
|
|
|
63
63
|
* nameIdFormat: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress",
|
|
64
64
|
* },
|
|
65
65
|
* });
|
|
66
|
+
* // Configure SSO using LDAP
|
|
67
|
+
* const ldapSsoSettings = new grafana.oss.SsoSettings("ldap_sso_settings", {
|
|
68
|
+
* providerName: "ldap",
|
|
69
|
+
* ldapSettings: {
|
|
70
|
+
* enabled: true,
|
|
71
|
+
* config: {
|
|
72
|
+
* servers: [{
|
|
73
|
+
* host: "127.0.0.1",
|
|
74
|
+
* port: 389,
|
|
75
|
+
* searchFilter: "(cn=%s)",
|
|
76
|
+
* bindDn: "cn=admin,dc=grafana,dc=org",
|
|
77
|
+
* bindPassword: "grafana",
|
|
78
|
+
* searchBaseDns: ["dc=grafana,dc=org"],
|
|
79
|
+
* attributes: {
|
|
80
|
+
* name: "givenName",
|
|
81
|
+
* surname: "sn",
|
|
82
|
+
* username: "cn",
|
|
83
|
+
* member_of: "memberOf",
|
|
84
|
+
* email: "email",
|
|
85
|
+
* },
|
|
86
|
+
* groupMappings: [
|
|
87
|
+
* {
|
|
88
|
+
* groupDn: "cn=superadmins,dc=grafana,dc=org",
|
|
89
|
+
* orgRole: "Admin",
|
|
90
|
+
* orgId: 1,
|
|
91
|
+
* grafanaAdmin: true,
|
|
92
|
+
* },
|
|
93
|
+
* {
|
|
94
|
+
* groupDn: "cn=users,dc=grafana,dc=org",
|
|
95
|
+
* orgRole: "Editor",
|
|
96
|
+
* },
|
|
97
|
+
* {
|
|
98
|
+
* groupDn: "*",
|
|
99
|
+
* orgRole: "Viewer",
|
|
100
|
+
* },
|
|
101
|
+
* ],
|
|
102
|
+
* }],
|
|
103
|
+
* },
|
|
104
|
+
* },
|
|
105
|
+
* });
|
|
66
106
|
* ```
|
|
67
107
|
*
|
|
68
108
|
* ## Import
|
|
@@ -103,6 +143,7 @@ class SsoSettings extends pulumi.CustomResource {
|
|
|
103
143
|
opts = opts || {};
|
|
104
144
|
if (opts.id) {
|
|
105
145
|
const state = argsOrState;
|
|
146
|
+
resourceInputs["ldapSettings"] = state ? state.ldapSettings : undefined;
|
|
106
147
|
resourceInputs["oauth2Settings"] = state ? state.oauth2Settings : undefined;
|
|
107
148
|
resourceInputs["providerName"] = state ? state.providerName : undefined;
|
|
108
149
|
resourceInputs["samlSettings"] = state ? state.samlSettings : undefined;
|
|
@@ -112,6 +153,7 @@ class SsoSettings extends pulumi.CustomResource {
|
|
|
112
153
|
if ((!args || args.providerName === undefined) && !opts.urn) {
|
|
113
154
|
throw new Error("Missing required property 'providerName'");
|
|
114
155
|
}
|
|
156
|
+
resourceInputs["ldapSettings"] = args ? args.ldapSettings : undefined;
|
|
115
157
|
resourceInputs["oauth2Settings"] = args ? args.oauth2Settings : undefined;
|
|
116
158
|
resourceInputs["providerName"] = args ? args.providerName : undefined;
|
|
117
159
|
resourceInputs["samlSettings"] = args ? args.samlSettings : undefined;
|
package/oss/ssoSettings.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssoSettings.js","sourceRoot":"","sources":["../../oss/ssoSettings.ts"],"names":[],"mappings":";AAAA,wFAAwF;AACxF,iFAAiF;;;AAEjF,yCAAyC;AAGzC,0CAA0C;AAE1C
|
|
1
|
+
{"version":3,"file":"ssoSettings.js","sourceRoot":"","sources":["../../oss/ssoSettings.ts"],"names":[],"mappings":"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"}
|
package/oss/team.d.ts
CHANGED
|
@@ -79,6 +79,10 @@ export declare class Team extends pulumi.CustomResource {
|
|
|
79
79
|
* API](https://grafana.com/docs/grafana/latest/developers/http_api/team_sync/)
|
|
80
80
|
*/
|
|
81
81
|
readonly teamSync: pulumi.Output<outputs.oss.TeamTeamSync | undefined>;
|
|
82
|
+
/**
|
|
83
|
+
* The team uid assigned to this team by Grafana.
|
|
84
|
+
*/
|
|
85
|
+
readonly teamUid: pulumi.Output<string>;
|
|
82
86
|
/**
|
|
83
87
|
* Create a Team resource with the given unique name, arguments, and options.
|
|
84
88
|
*
|
|
@@ -121,6 +125,10 @@ export interface TeamState {
|
|
|
121
125
|
* API](https://grafana.com/docs/grafana/latest/developers/http_api/team_sync/)
|
|
122
126
|
*/
|
|
123
127
|
teamSync?: pulumi.Input<inputs.oss.TeamTeamSync>;
|
|
128
|
+
/**
|
|
129
|
+
* The team uid assigned to this team by Grafana.
|
|
130
|
+
*/
|
|
131
|
+
teamUid?: pulumi.Input<string>;
|
|
124
132
|
}
|
|
125
133
|
/**
|
|
126
134
|
* The set of arguments for constructing a Team resource.
|
package/oss/team.js
CHANGED
|
@@ -74,6 +74,7 @@ class Team extends pulumi.CustomResource {
|
|
|
74
74
|
resourceInputs["preferences"] = state ? state.preferences : undefined;
|
|
75
75
|
resourceInputs["teamId"] = state ? state.teamId : undefined;
|
|
76
76
|
resourceInputs["teamSync"] = state ? state.teamSync : undefined;
|
|
77
|
+
resourceInputs["teamUid"] = state ? state.teamUid : undefined;
|
|
77
78
|
}
|
|
78
79
|
else {
|
|
79
80
|
const args = argsOrState;
|
|
@@ -85,6 +86,7 @@ class Team extends pulumi.CustomResource {
|
|
|
85
86
|
resourceInputs["preferences"] = args ? args.preferences : undefined;
|
|
86
87
|
resourceInputs["teamSync"] = args ? args.teamSync : undefined;
|
|
87
88
|
resourceInputs["teamId"] = undefined /*out*/;
|
|
89
|
+
resourceInputs["teamUid"] = undefined /*out*/;
|
|
88
90
|
}
|
|
89
91
|
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
|
|
90
92
|
const aliasOpts = { aliases: [{ type: "grafana:index/team:Team" }] };
|
package/oss/team.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"team.js","sourceRoot":"","sources":["../../oss/team.ts"],"names":[],"mappings":";AAAA,wFAAwF;AACxF,iFAAiF;;;AAEjF,yCAAyC;AAGzC,0CAA0C;AAE1C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,MAAa,IAAK,SAAQ,MAAM,CAAC,cAAc;IAC3C;;;;;;;;OAQG;IACI,MAAM,CAAC,GAAG,CAAC,IAAY,EAAE,EAA2B,EAAE,KAAiB,EAAE,IAAmC;QAC/G,OAAO,IAAI,IAAI,CAAC,IAAI,EAAO,KAAK,kCAAO,IAAI,KAAE,EAAE,EAAE,EAAE,IAAG,CAAC;IAC3D,CAAC;IAKD;;;OAGG;IACI,MAAM,CAAC,UAAU,CAAC,GAAQ;QAC7B,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE;YACnC,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,GAAG,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC,YAAY,CAAC;IACrD,CAAC;
|
|
1
|
+
{"version":3,"file":"team.js","sourceRoot":"","sources":["../../oss/team.ts"],"names":[],"mappings":"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"}
|
package/oss/user.d.ts
CHANGED
|
@@ -6,6 +6,7 @@ import * as pulumi from "@pulumi/pulumi";
|
|
|
6
6
|
* This resource represents an instance-scoped resource and uses Grafana's admin APIs.
|
|
7
7
|
* It does not work with API tokens or service accounts which are org-scoped.
|
|
8
8
|
* You must use basic auth.
|
|
9
|
+
* This resource is also not compatible with Grafana Cloud, as it does not allow basic auth.
|
|
9
10
|
*
|
|
10
11
|
* ## Example Usage
|
|
11
12
|
*
|
package/oss/user.js
CHANGED
|
@@ -12,6 +12,7 @@ const utilities = require("../utilities");
|
|
|
12
12
|
* This resource represents an instance-scoped resource and uses Grafana's admin APIs.
|
|
13
13
|
* It does not work with API tokens or service accounts which are org-scoped.
|
|
14
14
|
* You must use basic auth.
|
|
15
|
+
* This resource is also not compatible with Grafana Cloud, as it does not allow basic auth.
|
|
15
16
|
*
|
|
16
17
|
* ## Example Usage
|
|
17
18
|
*
|
package/oss/user.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../oss/user.ts"],"names":[],"mappings":";AAAA,wFAAwF;AACxF,iFAAiF;;;AAEjF,yCAAyC;AACzC,0CAA0C;AAE1C
|
|
1
|
+
{"version":3,"file":"user.js","sourceRoot":"","sources":["../../oss/user.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pulumiverse/grafana",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.1",
|
|
4
4
|
"description": "A Pulumi package for creating and managing grafana.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"pulumi",
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"pulumi": {
|
|
25
25
|
"resource": true,
|
|
26
26
|
"name": "grafana",
|
|
27
|
-
"version": "0.7.
|
|
27
|
+
"version": "0.7.1",
|
|
28
28
|
"server": "github://api.github.com/pulumiverse"
|
|
29
29
|
}
|
|
30
30
|
}
|
package/provider.d.ts
CHANGED
|
@@ -30,6 +30,25 @@ export declare class Provider extends pulumi.ProviderResource {
|
|
|
30
30
|
* Grafana Cloud's API URL. May alternatively be set via the `GRAFANA_CLOUD_API_URL` environment variable.
|
|
31
31
|
*/
|
|
32
32
|
readonly cloudApiUrl: pulumi.Output<string | undefined>;
|
|
33
|
+
/**
|
|
34
|
+
* A Grafana Cloud Provider access token. May alternatively be set via the `GRAFANA_CLOUD_PROVIDER_ACCESS_TOKEN`
|
|
35
|
+
* environment variable.
|
|
36
|
+
*/
|
|
37
|
+
readonly cloudProviderAccessToken: pulumi.Output<string | undefined>;
|
|
38
|
+
/**
|
|
39
|
+
* A Grafana Cloud Provider backend address. May alternatively be set via the `GRAFANA_CLOUD_PROVIDER_URL` environment
|
|
40
|
+
* variable.
|
|
41
|
+
*/
|
|
42
|
+
readonly cloudProviderUrl: pulumi.Output<string | undefined>;
|
|
43
|
+
/**
|
|
44
|
+
* A Grafana Connections API access token. May alternatively be set via the `GRAFANA_CONNECTIONS_API_ACCESS_TOKEN`
|
|
45
|
+
* environment variable.
|
|
46
|
+
*/
|
|
47
|
+
readonly connectionsApiAccessToken: pulumi.Output<string | undefined>;
|
|
48
|
+
/**
|
|
49
|
+
* A Grafana Connections API address. May alternatively be set via the `GRAFANA_CONNECTIONS_API_URL` environment variable.
|
|
50
|
+
*/
|
|
51
|
+
readonly connectionsApiUrl: pulumi.Output<string | undefined>;
|
|
33
52
|
/**
|
|
34
53
|
* A Grafana OnCall access token. May alternatively be set via the `GRAFANA_ONCALL_ACCESS_TOKEN` environment variable.
|
|
35
54
|
*/
|
|
@@ -89,6 +108,25 @@ export interface ProviderArgs {
|
|
|
89
108
|
* Grafana Cloud's API URL. May alternatively be set via the `GRAFANA_CLOUD_API_URL` environment variable.
|
|
90
109
|
*/
|
|
91
110
|
cloudApiUrl?: pulumi.Input<string>;
|
|
111
|
+
/**
|
|
112
|
+
* A Grafana Cloud Provider access token. May alternatively be set via the `GRAFANA_CLOUD_PROVIDER_ACCESS_TOKEN`
|
|
113
|
+
* environment variable.
|
|
114
|
+
*/
|
|
115
|
+
cloudProviderAccessToken?: pulumi.Input<string>;
|
|
116
|
+
/**
|
|
117
|
+
* A Grafana Cloud Provider backend address. May alternatively be set via the `GRAFANA_CLOUD_PROVIDER_URL` environment
|
|
118
|
+
* variable.
|
|
119
|
+
*/
|
|
120
|
+
cloudProviderUrl?: pulumi.Input<string>;
|
|
121
|
+
/**
|
|
122
|
+
* A Grafana Connections API access token. May alternatively be set via the `GRAFANA_CONNECTIONS_API_ACCESS_TOKEN`
|
|
123
|
+
* environment variable.
|
|
124
|
+
*/
|
|
125
|
+
connectionsApiAccessToken?: pulumi.Input<string>;
|
|
126
|
+
/**
|
|
127
|
+
* A Grafana Connections API address. May alternatively be set via the `GRAFANA_CONNECTIONS_API_URL` environment variable.
|
|
128
|
+
*/
|
|
129
|
+
connectionsApiUrl?: pulumi.Input<string>;
|
|
92
130
|
/**
|
|
93
131
|
* Skip TLS certificate verification. May alternatively be set via the `GRAFANA_INSECURE_SKIP_VERIFY` environment variable.
|
|
94
132
|
*/
|
package/provider.js
CHANGED
|
@@ -38,6 +38,10 @@ class Provider extends pulumi.ProviderResource {
|
|
|
38
38
|
resourceInputs["caCert"] = (_b = (args ? args.caCert : undefined)) !== null && _b !== void 0 ? _b : utilities.getEnv("GRAFANA_CA_CERT");
|
|
39
39
|
resourceInputs["cloudAccessPolicyToken"] = (_c = ((args === null || args === void 0 ? void 0 : args.cloudAccessPolicyToken) ? pulumi.secret(args.cloudAccessPolicyToken) : undefined)) !== null && _c !== void 0 ? _c : utilities.getEnv("GRAFANA_CLOUD_ACCESS_POLICY_TOKEN");
|
|
40
40
|
resourceInputs["cloudApiUrl"] = (_d = (args ? args.cloudApiUrl : undefined)) !== null && _d !== void 0 ? _d : utilities.getEnv("GRAFANA_CLOUD_API_URL");
|
|
41
|
+
resourceInputs["cloudProviderAccessToken"] = (args === null || args === void 0 ? void 0 : args.cloudProviderAccessToken) ? pulumi.secret(args.cloudProviderAccessToken) : undefined;
|
|
42
|
+
resourceInputs["cloudProviderUrl"] = args ? args.cloudProviderUrl : undefined;
|
|
43
|
+
resourceInputs["connectionsApiAccessToken"] = (args === null || args === void 0 ? void 0 : args.connectionsApiAccessToken) ? pulumi.secret(args.connectionsApiAccessToken) : undefined;
|
|
44
|
+
resourceInputs["connectionsApiUrl"] = args ? args.connectionsApiUrl : undefined;
|
|
41
45
|
resourceInputs["insecureSkipVerify"] = pulumi.output((_e = (args ? args.insecureSkipVerify : undefined)) !== null && _e !== void 0 ? _e : utilities.getEnvBoolean("GRAFANA_INSECURE_SKIP_VERIFY")).apply(JSON.stringify);
|
|
42
46
|
resourceInputs["oncallAccessToken"] = (_f = ((args === null || args === void 0 ? void 0 : args.oncallAccessToken) ? pulumi.secret(args.oncallAccessToken) : undefined)) !== null && _f !== void 0 ? _f : utilities.getEnv("GRAFANA_ONCALL_ACCESS_TOKEN");
|
|
43
47
|
resourceInputs["oncallUrl"] = (_g = (args ? args.oncallUrl : undefined)) !== null && _g !== void 0 ? _g : utilities.getEnv("GRAFANA_ONCALL_URL");
|
|
@@ -52,7 +56,7 @@ class Provider extends pulumi.ProviderResource {
|
|
|
52
56
|
resourceInputs["url"] = (_q = (args ? args.url : undefined)) !== null && _q !== void 0 ? _q : utilities.getEnv("GRAFANA_URL");
|
|
53
57
|
}
|
|
54
58
|
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
|
|
55
|
-
const secretOpts = { additionalSecretOutputs: ["auth", "cloudAccessPolicyToken", "oncallAccessToken", "smAccessToken", "tlsKey"] };
|
|
59
|
+
const secretOpts = { additionalSecretOutputs: ["auth", "cloudAccessPolicyToken", "cloudProviderAccessToken", "connectionsApiAccessToken", "oncallAccessToken", "smAccessToken", "tlsKey"] };
|
|
56
60
|
opts = pulumi.mergeOptions(opts, secretOpts);
|
|
57
61
|
super(Provider.__pulumiType, name, resourceInputs, opts);
|
|
58
62
|
}
|
package/provider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../provider.ts"],"names":[],"mappings":";AAAA,wFAAwF;AACxF,iFAAiF;;;AAEjF,yCAAyC;AACzC,yCAAyC;AAEzC;;;;;GAKG;AACH,MAAa,QAAS,SAAQ,MAAM,CAAC,gBAAgB;IAIjD;;;OAGG;IACI,MAAM,CAAC,UAAU,CAAC,GAAQ;QAC7B,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE;YACnC,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,GAAG,CAAC,cAAc,CAAC,KAAK,mBAAmB,GAAG,QAAQ,CAAC,YAAY,CAAC;IAC/E,CAAC;
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../provider.ts"],"names":[],"mappings":"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"}
|
package/roleAssignmentItem.d.ts
CHANGED
|
@@ -71,7 +71,7 @@ export declare class RoleAssignmentItem extends pulumi.CustomResource {
|
|
|
71
71
|
*/
|
|
72
72
|
static isInstance(obj: any): obj is RoleAssignmentItem;
|
|
73
73
|
/**
|
|
74
|
-
* The Organization ID. If not set, the
|
|
74
|
+
* The Organization ID. If not set, the default organization is used for basic authentication, or the one that owns your service account for token authentication.
|
|
75
75
|
*/
|
|
76
76
|
readonly orgId: pulumi.Output<string>;
|
|
77
77
|
/**
|
|
@@ -105,7 +105,7 @@ export declare class RoleAssignmentItem extends pulumi.CustomResource {
|
|
|
105
105
|
*/
|
|
106
106
|
export interface RoleAssignmentItemState {
|
|
107
107
|
/**
|
|
108
|
-
* The Organization ID. If not set, the
|
|
108
|
+
* The Organization ID. If not set, the default organization is used for basic authentication, or the one that owns your service account for token authentication.
|
|
109
109
|
*/
|
|
110
110
|
orgId?: pulumi.Input<string>;
|
|
111
111
|
/**
|
|
@@ -130,7 +130,7 @@ export interface RoleAssignmentItemState {
|
|
|
130
130
|
*/
|
|
131
131
|
export interface RoleAssignmentItemArgs {
|
|
132
132
|
/**
|
|
133
|
-
* The Organization ID. If not set, the
|
|
133
|
+
* The Organization ID. If not set, the default organization is used for basic authentication, or the one that owns your service account for token authentication.
|
|
134
134
|
*/
|
|
135
135
|
orgId?: pulumi.Input<string>;
|
|
136
136
|
/**
|
package/ruleGroup.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import * as outputs from "./types/output";
|
|
|
4
4
|
/**
|
|
5
5
|
* Manages Grafana Alerting rule groups.
|
|
6
6
|
*
|
|
7
|
-
* *
|
|
7
|
+
* * Official documentation
|
|
8
8
|
* * [HTTP API](https://grafana.com/docs/grafana/latest/developers/http_api/alerting_provisioning/#alert-rules)
|
|
9
9
|
*
|
|
10
10
|
* This resource requires Grafana 9.1.0 or later.
|
package/ruleGroup.js
CHANGED
|
@@ -8,7 +8,7 @@ const utilities = require("./utilities");
|
|
|
8
8
|
/**
|
|
9
9
|
* Manages Grafana Alerting rule groups.
|
|
10
10
|
*
|
|
11
|
-
* *
|
|
11
|
+
* * Official documentation
|
|
12
12
|
* * [HTTP API](https://grafana.com/docs/grafana/latest/developers/http_api/alerting_provisioning/#alert-rules)
|
|
13
13
|
*
|
|
14
14
|
* This resource requires Grafana 9.1.0 or later.
|
|
@@ -61,7 +61,7 @@ export declare class ServiceAccountPermissionItem extends pulumi.CustomResource
|
|
|
61
61
|
*/
|
|
62
62
|
static isInstance(obj: any): obj is ServiceAccountPermissionItem;
|
|
63
63
|
/**
|
|
64
|
-
* The Organization ID. If not set, the
|
|
64
|
+
* The Organization ID. If not set, the default organization is used for basic authentication, or the one that owns your service account for token authentication.
|
|
65
65
|
*/
|
|
66
66
|
readonly orgId: pulumi.Output<string>;
|
|
67
67
|
/**
|
|
@@ -95,7 +95,7 @@ export declare class ServiceAccountPermissionItem extends pulumi.CustomResource
|
|
|
95
95
|
*/
|
|
96
96
|
export interface ServiceAccountPermissionItemState {
|
|
97
97
|
/**
|
|
98
|
-
* The Organization ID. If not set, the
|
|
98
|
+
* The Organization ID. If not set, the default organization is used for basic authentication, or the one that owns your service account for token authentication.
|
|
99
99
|
*/
|
|
100
100
|
orgId?: pulumi.Input<string>;
|
|
101
101
|
/**
|
|
@@ -120,7 +120,7 @@ export interface ServiceAccountPermissionItemState {
|
|
|
120
120
|
*/
|
|
121
121
|
export interface ServiceAccountPermissionItemArgs {
|
|
122
122
|
/**
|
|
123
|
-
* The Organization ID. If not set, the
|
|
123
|
+
* The Organization ID. If not set, the default organization is used for basic authentication, or the one that owns your service account for token authentication.
|
|
124
124
|
*/
|
|
125
125
|
orgId?: pulumi.Input<string>;
|
|
126
126
|
/**
|
package/slo/slo.d.ts
CHANGED
|
@@ -170,7 +170,7 @@ export declare class SLO extends pulumi.CustomResource {
|
|
|
170
170
|
/**
|
|
171
171
|
* Destination Datasource sets the datasource defined for an SLO
|
|
172
172
|
*/
|
|
173
|
-
readonly destinationDatasource: pulumi.Output<outputs.slo.SLODestinationDatasource
|
|
173
|
+
readonly destinationDatasource: pulumi.Output<outputs.slo.SLODestinationDatasource>;
|
|
174
174
|
/**
|
|
175
175
|
* UID for the SLO folder
|
|
176
176
|
*/
|
|
@@ -191,6 +191,10 @@ export declare class SLO extends pulumi.CustomResource {
|
|
|
191
191
|
* Query describes the indicator that will be measured against the objective. Freeform Query types are currently supported.
|
|
192
192
|
*/
|
|
193
193
|
readonly queries: pulumi.Output<outputs.slo.SLOQuery[]>;
|
|
194
|
+
/**
|
|
195
|
+
* The name of a search expression in Grafana Asserts. This is used in the SLO UI to open the Asserts RCA workbench and in alerts to link to the RCA workbench.
|
|
196
|
+
*/
|
|
197
|
+
readonly searchExpression: pulumi.Output<string | undefined>;
|
|
194
198
|
/**
|
|
195
199
|
* Create a SLO resource with the given unique name, arguments, and options.
|
|
196
200
|
*
|
|
@@ -240,6 +244,10 @@ export interface SLOState {
|
|
|
240
244
|
* Query describes the indicator that will be measured against the objective. Freeform Query types are currently supported.
|
|
241
245
|
*/
|
|
242
246
|
queries?: pulumi.Input<pulumi.Input<inputs.slo.SLOQuery>[]>;
|
|
247
|
+
/**
|
|
248
|
+
* The name of a search expression in Grafana Asserts. This is used in the SLO UI to open the Asserts RCA workbench and in alerts to link to the RCA workbench.
|
|
249
|
+
*/
|
|
250
|
+
searchExpression?: pulumi.Input<string>;
|
|
243
251
|
}
|
|
244
252
|
/**
|
|
245
253
|
* The set of arguments for constructing a SLO resource.
|
|
@@ -260,7 +268,7 @@ export interface SLOArgs {
|
|
|
260
268
|
/**
|
|
261
269
|
* Destination Datasource sets the datasource defined for an SLO
|
|
262
270
|
*/
|
|
263
|
-
destinationDatasource
|
|
271
|
+
destinationDatasource: pulumi.Input<inputs.slo.SLODestinationDatasource>;
|
|
264
272
|
/**
|
|
265
273
|
* UID for the SLO folder
|
|
266
274
|
*/
|
|
@@ -281,4 +289,8 @@ export interface SLOArgs {
|
|
|
281
289
|
* Query describes the indicator that will be measured against the objective. Freeform Query types are currently supported.
|
|
282
290
|
*/
|
|
283
291
|
queries: pulumi.Input<pulumi.Input<inputs.slo.SLOQuery>[]>;
|
|
292
|
+
/**
|
|
293
|
+
* The name of a search expression in Grafana Asserts. This is used in the SLO UI to open the Asserts RCA workbench and in alerts to link to the RCA workbench.
|
|
294
|
+
*/
|
|
295
|
+
searchExpression?: pulumi.Input<string>;
|
|
284
296
|
}
|
package/slo/slo.js
CHANGED
|
@@ -179,12 +179,16 @@ class SLO extends pulumi.CustomResource {
|
|
|
179
179
|
resourceInputs["name"] = state ? state.name : undefined;
|
|
180
180
|
resourceInputs["objectives"] = state ? state.objectives : undefined;
|
|
181
181
|
resourceInputs["queries"] = state ? state.queries : undefined;
|
|
182
|
+
resourceInputs["searchExpression"] = state ? state.searchExpression : undefined;
|
|
182
183
|
}
|
|
183
184
|
else {
|
|
184
185
|
const args = argsOrState;
|
|
185
186
|
if ((!args || args.description === undefined) && !opts.urn) {
|
|
186
187
|
throw new Error("Missing required property 'description'");
|
|
187
188
|
}
|
|
189
|
+
if ((!args || args.destinationDatasource === undefined) && !opts.urn) {
|
|
190
|
+
throw new Error("Missing required property 'destinationDatasource'");
|
|
191
|
+
}
|
|
188
192
|
if ((!args || args.objectives === undefined) && !opts.urn) {
|
|
189
193
|
throw new Error("Missing required property 'objectives'");
|
|
190
194
|
}
|
|
@@ -199,6 +203,7 @@ class SLO extends pulumi.CustomResource {
|
|
|
199
203
|
resourceInputs["name"] = args ? args.name : undefined;
|
|
200
204
|
resourceInputs["objectives"] = args ? args.objectives : undefined;
|
|
201
205
|
resourceInputs["queries"] = args ? args.queries : undefined;
|
|
206
|
+
resourceInputs["searchExpression"] = args ? args.searchExpression : undefined;
|
|
202
207
|
}
|
|
203
208
|
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
|
|
204
209
|
const aliasOpts = { aliases: [{ type: "grafana:index/sLO:SLO" }] };
|
package/slo/slo.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slo.js","sourceRoot":"","sources":["../../slo/slo.ts"],"names":[],"mappings":";AAAA,wFAAwF;AACxF,iFAAiF;;;AAEjF,yCAAyC;AAGzC,0CAA0C;AAE1C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyIG;AACH,MAAa,GAAI,SAAQ,MAAM,CAAC,cAAc;IAC1C;;;;;;;;OAQG;IACI,MAAM,CAAC,GAAG,CAAC,IAAY,EAAE,EAA2B,EAAE,KAAgB,EAAE,IAAmC;QAC9G,OAAO,IAAI,GAAG,CAAC,IAAI,EAAO,KAAK,kCAAO,IAAI,KAAE,EAAE,EAAE,EAAE,IAAG,CAAC;IAC1D,CAAC;IAKD;;;OAGG;IACI,MAAM,CAAC,UAAU,CAAC,GAAQ;QAC7B,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE;YACnC,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,GAAG,CAAC,cAAc,CAAC,KAAK,GAAG,CAAC,YAAY,CAAC;IACpD,CAAC;
|
|
1
|
+
{"version":3,"file":"slo.js","sourceRoot":"","sources":["../../slo/slo.ts"],"names":[],"mappings":";AAAA,wFAAwF;AACxF,iFAAiF;;;AAEjF,yCAAyC;AAGzC,0CAA0C;AAE1C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyIG;AACH,MAAa,GAAI,SAAQ,MAAM,CAAC,cAAc;IAC1C;;;;;;;;OAQG;IACI,MAAM,CAAC,GAAG,CAAC,IAAY,EAAE,EAA2B,EAAE,KAAgB,EAAE,IAAmC;QAC9G,OAAO,IAAI,GAAG,CAAC,IAAI,EAAO,KAAK,kCAAO,IAAI,KAAE,EAAE,EAAE,EAAE,IAAG,CAAC;IAC1D,CAAC;IAKD;;;OAGG;IACI,MAAM,CAAC,UAAU,CAAC,GAAQ;QAC7B,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE;YACnC,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,GAAG,CAAC,cAAc,CAAC,KAAK,GAAG,CAAC,YAAY,CAAC;IACpD,CAAC;IAmDD,YAAY,IAAY,EAAE,WAAgC,EAAE,IAAmC;QAC3F,IAAI,cAAc,GAAkB,EAAE,CAAC;QACvC,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAClB,IAAI,IAAI,CAAC,EAAE,EAAE;YACT,MAAM,KAAK,GAAG,WAAmC,CAAC;YAClD,cAAc,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAClE,cAAc,CAAC,aAAa,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;YACtE,cAAc,CAAC,uBAAuB,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1F,cAAc,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAClE,cAAc,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;YAC5D,cAAc,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;YACxD,cAAc,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;YACpE,cAAc,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;YAC9D,cAAc,CAAC,kBAAkB,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC;SACnF;aAAM;YACH,MAAM,IAAI,GAAG,WAAkC,CAAC;YAChD,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;gBACxD,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;aAC9D;YACD,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,qBAAqB,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;gBAClE,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;aACxE;YACD,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;gBACvD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;aAC7D;YACD,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;gBACpD,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;aAC1D;YACD,cAAc,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAChE,cAAc,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;YACpE,cAAc,CAAC,uBAAuB,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,SAAS,CAAC;YACxF,cAAc,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAChE,cAAc,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1D,cAAc,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;YACtD,cAAc,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;YAClE,cAAc,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;YAC5D,cAAc,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC;SACjF;QACD,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,oBAAoB,EAAE,EAAE,IAAI,CAAC,CAAC;QACnE,MAAM,SAAS,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAC,EAAE,CAAC;QACnE,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC5C,KAAK,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;IACxD,CAAC;;AAvHL,kBAwHC;AA1GG,gBAAgB;AACO,gBAAY,GAAG,qBAAqB,CAAC"}
|
package/slo.d.ts
CHANGED
|
@@ -172,7 +172,7 @@ export declare class SLO extends pulumi.CustomResource {
|
|
|
172
172
|
/**
|
|
173
173
|
* Destination Datasource sets the datasource defined for an SLO
|
|
174
174
|
*/
|
|
175
|
-
readonly destinationDatasource: pulumi.Output<outputs.SLODestinationDatasource
|
|
175
|
+
readonly destinationDatasource: pulumi.Output<outputs.SLODestinationDatasource>;
|
|
176
176
|
/**
|
|
177
177
|
* UID for the SLO folder
|
|
178
178
|
*/
|
|
@@ -193,6 +193,10 @@ export declare class SLO extends pulumi.CustomResource {
|
|
|
193
193
|
* Query describes the indicator that will be measured against the objective. Freeform Query types are currently supported.
|
|
194
194
|
*/
|
|
195
195
|
readonly queries: pulumi.Output<outputs.SLOQuery[]>;
|
|
196
|
+
/**
|
|
197
|
+
* The name of a search expression in Grafana Asserts. This is used in the SLO UI to open the Asserts RCA workbench and in alerts to link to the RCA workbench.
|
|
198
|
+
*/
|
|
199
|
+
readonly searchExpression: pulumi.Output<string | undefined>;
|
|
196
200
|
/**
|
|
197
201
|
* Create a SLO resource with the given unique name, arguments, and options.
|
|
198
202
|
*
|
|
@@ -243,6 +247,10 @@ export interface SLOState {
|
|
|
243
247
|
* Query describes the indicator that will be measured against the objective. Freeform Query types are currently supported.
|
|
244
248
|
*/
|
|
245
249
|
queries?: pulumi.Input<pulumi.Input<inputs.SLOQuery>[]>;
|
|
250
|
+
/**
|
|
251
|
+
* The name of a search expression in Grafana Asserts. This is used in the SLO UI to open the Asserts RCA workbench and in alerts to link to the RCA workbench.
|
|
252
|
+
*/
|
|
253
|
+
searchExpression?: pulumi.Input<string>;
|
|
246
254
|
}
|
|
247
255
|
/**
|
|
248
256
|
* The set of arguments for constructing a SLO resource.
|
|
@@ -263,7 +271,7 @@ export interface SLOArgs {
|
|
|
263
271
|
/**
|
|
264
272
|
* Destination Datasource sets the datasource defined for an SLO
|
|
265
273
|
*/
|
|
266
|
-
destinationDatasource
|
|
274
|
+
destinationDatasource: pulumi.Input<inputs.SLODestinationDatasource>;
|
|
267
275
|
/**
|
|
268
276
|
* UID for the SLO folder
|
|
269
277
|
*/
|
|
@@ -284,4 +292,8 @@ export interface SLOArgs {
|
|
|
284
292
|
* Query describes the indicator that will be measured against the objective. Freeform Query types are currently supported.
|
|
285
293
|
*/
|
|
286
294
|
queries: pulumi.Input<pulumi.Input<inputs.SLOQuery>[]>;
|
|
295
|
+
/**
|
|
296
|
+
* The name of a search expression in Grafana Asserts. This is used in the SLO UI to open the Asserts RCA workbench and in alerts to link to the RCA workbench.
|
|
297
|
+
*/
|
|
298
|
+
searchExpression?: pulumi.Input<string>;
|
|
287
299
|
}
|
package/slo.js
CHANGED
|
@@ -184,12 +184,16 @@ class SLO extends pulumi.CustomResource {
|
|
|
184
184
|
resourceInputs["name"] = state ? state.name : undefined;
|
|
185
185
|
resourceInputs["objectives"] = state ? state.objectives : undefined;
|
|
186
186
|
resourceInputs["queries"] = state ? state.queries : undefined;
|
|
187
|
+
resourceInputs["searchExpression"] = state ? state.searchExpression : undefined;
|
|
187
188
|
}
|
|
188
189
|
else {
|
|
189
190
|
const args = argsOrState;
|
|
190
191
|
if ((!args || args.description === undefined) && !opts.urn) {
|
|
191
192
|
throw new Error("Missing required property 'description'");
|
|
192
193
|
}
|
|
194
|
+
if ((!args || args.destinationDatasource === undefined) && !opts.urn) {
|
|
195
|
+
throw new Error("Missing required property 'destinationDatasource'");
|
|
196
|
+
}
|
|
193
197
|
if ((!args || args.objectives === undefined) && !opts.urn) {
|
|
194
198
|
throw new Error("Missing required property 'objectives'");
|
|
195
199
|
}
|
|
@@ -204,6 +208,7 @@ class SLO extends pulumi.CustomResource {
|
|
|
204
208
|
resourceInputs["name"] = args ? args.name : undefined;
|
|
205
209
|
resourceInputs["objectives"] = args ? args.objectives : undefined;
|
|
206
210
|
resourceInputs["queries"] = args ? args.queries : undefined;
|
|
211
|
+
resourceInputs["searchExpression"] = args ? args.searchExpression : undefined;
|
|
207
212
|
}
|
|
208
213
|
opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
|
|
209
214
|
const aliasOpts = { aliases: [{ type: "grafana:index/sLO:SLO" }] };
|
package/slo.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slo.js","sourceRoot":"","sources":["../slo.ts"],"names":[],"mappings":";AAAA,wFAAwF;AACxF,iFAAiF;;;AAEjF,yCAAyC;AAGzC,yCAAyC;AAEzC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2IG;AACH,MAAa,GAAI,SAAQ,MAAM,CAAC,cAAc;IAC1C;;;;;;;;OAQG;IACI,MAAM,CAAC,GAAG,CAAC,IAAY,EAAE,EAA2B,EAAE,KAAgB,EAAE,IAAmC;QAC9G,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,8FAA8F,CAAC,CAAA;QAC/G,OAAO,IAAI,GAAG,CAAC,IAAI,EAAO,KAAK,kCAAO,IAAI,KAAE,EAAE,EAAE,EAAE,IAAG,CAAC;IAC1D,CAAC;IAKD;;;OAGG;IACI,MAAM,CAAC,UAAU,CAAC,GAAQ;QAC7B,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE;YACnC,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,GAAG,CAAC,cAAc,CAAC,KAAK,GAAG,CAAC,YAAY,CAAC;IACpD,CAAC;
|
|
1
|
+
{"version":3,"file":"slo.js","sourceRoot":"","sources":["../slo.ts"],"names":[],"mappings":"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"}
|