Commit 4b74b9cd authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

Merge branch 'hotfix-v1.4'

parents 4c862c19 82439e4e
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ additionalPrometheusRulesMap:
    - name: Node Alerts
      rules:
      - alert: HostRebooted
        expr: changes(node_boot_time_seconds[10m]) > 0
        expr: changes(node_boot_time_seconds[10m]) > 10
        for: 0m
        labels:
          severity: warning
@@ -96,13 +96,13 @@ additionalPrometheusRulesMap:
          summary: Kubernetes pod crash looping (instance {{ $labels.instance }})
          description: Pod {{ $labels.pod }} is crash looping\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}
      - alert: KubernetesPodNotHealthy
        expr: min_over_time(sum by (namespace, pod) (kube_pod_status_phase{phase=~"Pending|Unknown|Failed"})[15m:]) > 0
        for: 5m
        expr: sum by (namespace, pod) (sum_over_time(kube_pod_status_phase{phase=~"Pending|Unknown|Failed"}[5m])) >= 10
        for: 0m
        labels:
          severity: critical
        annotations:
          summary: Kubernetes Pod not healthy (instance {{ $labels.instance }})
          description: Pod has been in a non-ready state for more than 5 minutes in the last 15 minutes.\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}
          description: Pod has been in a non-ready state for more than 5 minutes.\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}

alertmanager:
  enabled: true
+16 −17
Original line number Diff line number Diff line
@@ -16,12 +16,11 @@ servers:
  - url: 'https://localhost/sandboxname/location/v2'
tags:
- name: 'location'
- name: 'beta'
paths:
  /queries/distance:
    get:
      tags:
      - 'beta'
      - 'location'
      summary: 'UE Distance Lookup of a specific UE'
      description: 'UE Distance Lookup between terminals or a terminal and a location'
      operationId: distanceGET
@@ -218,7 +217,7 @@ paths:
  /subscriptions/area/circle:
    get:
      tags:
      - 'beta'
      - 'location'
      summary: 'Retrieves all active subscriptions to area change notifications'
      description: 'This operation is used for retrieving all active subscriptions to area change notifications.'
      operationId: areaCircleSubListGET
@@ -236,7 +235,7 @@ paths:
                    $ref: '#/components/schemas/NotificationSubscriptionList'
    post:
      tags:
      - 'beta'
      - 'location'
      summary: 'Creates a subscription for area change notification'
      description: 'Creates a subscription to the Location Service for an area change notification.'
      operationId: areaCircleSubPOST
@@ -308,7 +307,7 @@ paths:
  /subscriptions/area/circle/{subscriptionId}:
    get:
      tags:
      - 'beta'
      - 'location'
      summary: 'Retrieve subscription information'
      description: 'Get subscription information.'
      operationId: areaCircleSubGET
@@ -341,7 +340,7 @@ paths:
      x-swagger-router-controller: 'subscriptions'
    put:
      tags:
      - 'beta'
      - 'location'
      summary: 'Updates a subscription information'
      description: 'Updates a subscription.'
      operationId: areaCircleSubPUT
@@ -399,7 +398,7 @@ paths:
      x-swagger-router-controller: 'subscriptions'
    delete:
      tags:
      - 'beta'
      - 'location'
      summary: 'Cancel a subscription'
      description: 'Method to delete a subscription.'
      operationId: areaCircleSubDELETE
@@ -420,7 +419,7 @@ paths:
  /subscriptions/distance:
    get:
      tags:
      - 'beta'
      - 'location'
      summary: 'Retrieves all active subscriptions to distance change notifications'
      description: 'This operation is used for retrieving all active subscriptions to a distance change notifications.'
      operationId: distanceSubListGET
@@ -438,7 +437,7 @@ paths:
                    $ref: '#/components/schemas/NotificationSubscriptionList'
    post:
      tags:
      - 'beta'
      - 'location'
      summary: 'Creates a subscription for distance change notification'
      description: 'Creates a subscription to the Location Service for a distance change notification.'
      operationId: distanceSubPOST
@@ -511,7 +510,7 @@ paths:
  /subscriptions/distance/{subscriptionId}:
    get:
      tags:
      - 'beta'
      - 'location'
      summary: 'Retrieve subscription information'
      description: 'Get subscription information.'
      operationId: distanceSubGET
@@ -544,7 +543,7 @@ paths:
      x-swagger-router-controller: 'subscriptions'
    put:
      tags:
      - 'beta'
      - 'location'
      summary: 'Updates a subscription information'
      description: 'Updates a subscription.'
      operationId: distanceSubPUT
@@ -603,7 +602,7 @@ paths:
      x-swagger-router-controller: 'subscriptions'
    delete:
      tags:
      - 'beta'
      - 'location'
      summary: 'Cancel a subscription'
      description: 'Method to delete a subscription.'
      operationId: distanceSubDELETE
@@ -624,7 +623,7 @@ paths:
  /subscriptions/periodic:
    get:
      tags:
      - 'beta'
      - 'location'
      summary: 'Retrieves all active subscriptions to periodic notifications'
      description: 'This operation is used for retrieving all active subscriptions to periodic notifications.'
      operationId: periodicSubListGET
@@ -642,7 +641,7 @@ paths:
                    $ref: '#/components/schemas/NotificationSubscriptionList'
    post:
      tags:
      - 'beta'
      - 'location'
      summary: 'Creates a subscription for periodic notification'
      description: 'Creates a subscription to the Location Service for a periodic notification.'
      operationId: periodicSubPOST
@@ -702,7 +701,7 @@ paths:
  /subscriptions/periodic/{subscriptionId}:
    get:
      tags:
      - 'beta'
      - 'location'
      summary: 'Retrieve subscription information'
      description: 'Get subscription information.'
      operationId: periodicSubGET
@@ -735,7 +734,7 @@ paths:
      x-swagger-router-controller: 'subscriptions'
    put:
      tags:
      - 'beta'
      - 'location'
      summary: 'Updates a subscription information'
      description: 'Updates a subscription.'
      operationId: periodicSubPUT
@@ -780,7 +779,7 @@ paths:
      x-swagger-router-controller: "subscriptions"
    delete:
      tags:
      - 'beta'
      - 'location'
      summary: 'Cancel a subscription'
      description: 'Method to delete a subscription.'
      operationId: periodicSubDELETE