Merge pull request #11720 from linode/staging

Release v1.137.0 - staging → master

Author: coliu-akamai

docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: '3.4'
 
 # Environment variables that will be exposed to every Cypress runner.
 x-e2e-env:

docs/GETTING_STARTED.md

@@ -3,7 +3,7 @@
 1. Fork this repository.
 2. Clone your fork to your local machine.
 3. Go to [cloud.linode.com/profile/clients](https://cloud.linode.com/profile/clients) and click "Add an OAuth App".
-4. Enter a label and set the callback URL to `http://localhost:3000/oauth/callback`.
+4. Enter a label, set the callback URL to `http://localhost:3000/oauth/callback`, and check the "Public" checkbox.
 5. After your OAuth App has been created, copy the ID (not the secret).
 6. In `packages/manager`, copy the contents of `.env.example` and paste them into a new file called `.env`.
 7. In `.env` set `REACT_APP_CLIENT_ID` to the ID from step 5.

packages/api-v4/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2025-02-25] - v0.135.0
+
+### Changed:
+
+- Update LKE Tiered Version endpoints ([#11703](https://github.com/linode/manager/pull/11703))
+
+### Upcoming Features:
+
+- Add `DateTimeWithPreset` type in CloudPulse types ([#11573](https://github.com/linode/manager/pull/11573))
+- Add `update_firewall` RoleType for IAM ([#11588](https://github.com/linode/manager/pull/11588))
+- Change attribute names in NotificationChannel and MetricCriteria types to reflect the latest API specification ([#11610](https://github.com/linode/manager/pull/11610))
+- Change type of the alertId in `editAlertDefinition` and `getAlertDefinitionByServiceTypeAndId` endpoints in CloudPulse alerts to string ([#11613](https://github.com/linode/manager/pull/11613))
+- Add new `class` type in alerts object ([#11642](https://github.com/linode/manager/pull/11642))
+
 ## [2025-02-11] - v0.134.0
 
 

packages/api-v4/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@linode/api-v4",
-  "version": "0.134.0",
+  "version": "0.135.0",
   "homepage": "https://github.com/linode/manager/tree/develop/packages/api-v4",
   "bugs": {
     "url": "https://github.com/linode/manager/issues"

packages/api-v4/src/account/types.ts

@@ -99,7 +99,7 @@ export const linodeInterfaceAccountSettings = [
   'legacy_config_default_but_linode_allowed',
   'linode_default_but_legacy_config_allowed',
   'linode_only',
-];
+] as const;
 
 export type LinodeInterfaceAccountSetting = typeof linodeInterfaceAccountSettings[number];
 

packages/api-v4/src/cloudpulse/alerts.ts

@@ -40,7 +40,7 @@ export const getAlertDefinitions = (params?: Params, filters?: Filter) =>
 
 export const getAlertDefinitionByServiceTypeAndId = (
   serviceType: string,
-  alertId: number
+  alertId: string
 ) =>
   Request<Alert>(
     setURL(
@@ -54,7 +54,7 @@ export const getAlertDefinitionByServiceTypeAndId = (
 export const editAlertDefinition = (
   data: EditAlertDefinitionPayload,
   serviceType: string,
-  alertId: number
+  alertId: string
 ) =>
   Request<Alert>(
     setURL(

packages/api-v4/src/cloudpulse/services.ts

@@ -1,21 +1,33 @@
 import { BETA_API_ROOT as API_ROOT } from 'src/constants';
-import Request, { setData, setMethod, setURL } from '../request';
+import Request, {
+  setData,
+  setMethod,
+  setParams,
+  setURL,
+  setXFilter,
+} from '../request';
 import {
   JWEToken,
   JWETokenPayLoad,
   MetricDefinition,
   ServiceTypesList,
 } from './types';
-import { ResourcePage } from 'src/types';
+import { Filter, Params, ResourcePage } from 'src/types';
 
-export const getMetricDefinitionsByServiceType = (serviceType: string) => {
+export const getMetricDefinitionsByServiceType = (
+  serviceType: string,
+  params?: Params,
+  filters?: Filter
+) => {
   return Request<ResourcePage<MetricDefinition>>(
     setURL(
       `${API_ROOT}/monitor/services/${encodeURIComponent(
         serviceType
       )}/metric-definitions`
     ),
-    setMethod('GET')
+    setMethod('GET'),
+    setParams(params),
+    setXFilter(filters)
   );
 };
 

packages/api-v4/src/cloudpulse/types.ts

@@ -2,6 +2,7 @@ export type AlertSeverityType = 0 | 1 | 2 | 3;
 export type MetricAggregationType = 'avg' | 'sum' | 'min' | 'max' | 'count';
 export type MetricOperatorType = 'eq' | 'gt' | 'lt' | 'gte' | 'lte';
 export type AlertServiceType = 'linode' | 'dbaas';
+export type AlertClass = 'dedicated' | 'shared';
 export type DimensionFilterOperatorType =
   | 'eq'
   | 'neq'
@@ -48,6 +49,12 @@ export interface TimeDuration {
   value: number;
 }
 
+export interface DateTimeWithPreset {
+  end: string;
+  start: string;
+  preset?: string;
+}
+
 export interface Widgets {
   label: string;
   metric: string;
@@ -80,6 +87,7 @@ export type FilterValue =
   | string[]
   | number[]
   | WidgetFilterValue
+  | DateTimeWithPreset
   | undefined;
 
 type WidgetFilterValue = { [key: string]: AclpWidget };
@@ -104,6 +112,7 @@ export interface MetricDefinition {
   scrape_interval: string;
   available_aggregate_functions: string[];
   dimensions: Dimension[];
+  is_alertable: boolean;
 }
 
 export interface Dimension {
@@ -125,7 +134,8 @@ export interface CloudPulseMetricsRequest {
   filters?: Filters[];
   aggregate_function: string;
   group_by: string;
-  relative_time_duration: TimeDuration;
+  relative_time_duration: TimeDuration | undefined;
+  absolute_time_duration: DateTimeWithPreset | undefined;
   time_granularity: TimeGranularity | undefined;
   entity_ids: number[];
 }
@@ -170,9 +180,10 @@ export interface CreateAlertDefinitionPayload {
   trigger_conditions: TriggerCondition;
   channel_ids: number[];
 }
+
 export interface MetricCriteria {
   metric: string;
-  aggregation_type: MetricAggregationType;
+  aggregate_function: MetricAggregationType;
   operator: MetricOperatorType;
   threshold: number;
   dimension_filters?: DimensionFilter[];
@@ -204,6 +215,7 @@ export interface Alert {
   label: string;
   tags: string[];
   description: string;
+  class?: AlertClass;
   has_more_resources: boolean;
   status: AlertStatusType;
   type: AlertDefinitionType;
@@ -214,11 +226,11 @@ export interface Alert {
     rules: AlertDefinitionMetricCriteria[];
   };
   trigger_conditions: TriggerCondition;
-  channels: {
-    id: string;
+  alert_channels: {
+    id: number;
     label: string;
     url: string;
-    type: 'channel';
+    type: 'alert-channel';
   }[];
   created_by: string;
   updated_by: string;
@@ -296,5 +308,14 @@ export type NotificationChannel =
   | NotificationChannelPagerDuty;
 
 export interface EditAlertDefinitionPayload {
-  entity_ids: string[];
+  entity_ids?: string[];
+  status?: AlertStatusType;
 }
+
+export interface EditAlertPayloadWithService
+  extends EditAlertDefinitionPayload {
+  serviceType: string;
+  alertId: string;
+}
+
+export type AlertStatusUpdateType = 'Enable' | 'Disable';

packages/api-v4/src/iam/types.ts

@@ -23,6 +23,7 @@ export type RoleType =
   | 'linode_viewer'
   | 'firewall_admin'
   | 'linode_creator'
+  | 'update_firewall'
   | 'firewall_creator';
 
 export interface IamUserPermissions {

packages/api-v4/src/kubernetes/kubernetes.ts

@@ -184,7 +184,7 @@ export const getKubernetesTieredVersionsBeta = (
     setMethod('GET'),
     setXFilter(filters),
     setParams(params),
-    setURL(`${BETA_API_ROOT}/lke/versions/${encodeURIComponent(tier)}`)
+    setURL(`${BETA_API_ROOT}/lke/tiers/${encodeURIComponent(tier)}/versions`)
   );
 
 /** getKubernetesVersion
@@ -212,9 +212,9 @@ export const getKubernetesTieredVersionBeta = (
   Request<KubernetesTieredVersion>(
     setMethod('GET'),
     setURL(
-      `${BETA_API_ROOT}/lke/versions/${encodeURIComponent(
+      `${BETA_API_ROOT}/lke/tiers/${encodeURIComponent(
         tier
-      )}/${encodeURIComponent(versionID)}`
+      )}/versions/${encodeURIComponent(versionID)}`
     )
   );