Skip to content

Commit

Permalink
Merge branch 'master' into brevo-assets-v1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
bparmar-crest authored Dec 12, 2024
2 parents 4ef71ba + e79adb4 commit e6b5409
Show file tree
Hide file tree
Showing 14 changed files with 147 additions and 12 deletions.
18 changes: 14 additions & 4 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -401,10 +401,20 @@ datadog_checks_base/datadog_checks/base/checks/windows/ @DataDog/wi
/hubspot_content_hub/manifest.json @DataDog/saas-integrations @DataDog/documentation
/hubspot_content_hub/assets/logs/ @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend @DataDog/logs-core

vonage/ @DataDog/saas-integrations
vonage/*.md @DataDog/saas-integrations @DataDog/documentation
vonage/manifest.json @DataDog/saas-integrations @DataDog/documentation
vonage/assets/logs/ @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend @DataDog/logs-core
vonage/ @DataDog/saas-integrations
vonage/*.md @DataDog/saas-integrations @DataDog/documentation
vonage/manifest.json @DataDog/saas-integrations @DataDog/documentation
vonage/assets/logs/ @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend @DataDog/logs-core

/asana/ @DataDog/saas-integrations
/asana/*.md @DataDog/saas-integrations @DataDog/documentation
/asana/manifest.json @DataDog/saas-integrations @DataDog/documentation
/asana/assets/logs/ @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend

hubspot_content_hub/ @DataDog/saas-integrations
hubspot_content_hub/*.md @DataDog/saas-integrations @DataDog/documentation
hubspot_content_hub/manifest.json @DataDog/saas-integrations @DataDog/documentation
hubspot_content_hub/assets/logs/ @DataDog/saas-integrations @DataDog/documentation @DataDog/logs-backend

plaid/ @DataDog/saas-integrations
plaid/*.md @DataDog/saas-integrations @DataDog/documentation
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/config/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ integration/argo_workflows:
- argo_workflows/**/*
integration/argocd:
- argocd/**/*
integration/asana:
- asana/**/*
integration/aspdotnet:
- aspdotnet/**/*
integration/avi_vantage:
Expand Down
7 changes: 7 additions & 0 deletions asana/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# CHANGELOG - asana

## 1.0.0 / 2024-10-28

***Added***:

* Initial Release
43 changes: 43 additions & 0 deletions asana/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Agent Check: asana

## Overview

This check monitors [asana][1].

## Setup

### Installation

The asana check is included in the [Datadog Agent][2] package.
No additional installation is needed on your server.

### Configuration

!!! Add list of steps to set up this integration !!!

### Validation

!!! Add steps to validate integration is functioning as expected !!!

## Data Collected

### Metrics

asana does not include any metrics.

### Service Checks

asana does not include any service checks.

### Events

asana does not include any events.

## Troubleshooting

Need help? Contact [Datadog support][3].

[1]: **LINK_TO_INTEGRATION_SITE**
[2]: https://app.datadoghq.com/account/settings/agent/latest
[3]: https://docs.datadoghq.com/help/

1 change: 1 addition & 0 deletions asana/assets/service_checks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
43 changes: 43 additions & 0 deletions asana/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"manifest_version": "2.0.0",
"app_uuid": "2287c449-1fb3-4897-8771-8ae5ead3c7ef",
"app_id": "asana",
"display_on_public_website": false,
"tile": {
"overview": "README.md#Overview",
"configuration": "README.md#Setup",
"support": "README.md#Support",
"changelog": "CHANGELOG.md",
"description": "Gain insights into Asana audit logs",
"title": "asana",
"media": [],
"classifier_tags": [
"Category::Log Collection",
"Category::Security",
"Submitted Data Type::Logs",
"Offering::Integration"
]
},
"assets": {
"integration": {
"auto_install": false,
"source_type_id": 30091439,
"source_type_name": "Asana",
"events": {
"creates_events": false
},
"service_checks": {
"metadata_path": "assets/service_checks.json"
}
},
"logs": {
"source": "asana"
}
},
"author": {
"support_email": "[email protected]",
"name": "Datadog",
"homepage": "https://www.datadoghq.com",
"sales_email": "[email protected]"
}
}
6 changes: 6 additions & 0 deletions elastic/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

<!-- towncrier release notes start -->

## 8.0.1 / 2024-12-11

***Fixed***:

* Regression fix: Handle missing index fields in payload. ([#19249](https://github.com/DataDog/integrations-core/pull/19249))

## 8.0.0 / 2024-10-04 / Agent 7.59.0

***Removed***:
Expand Down
1 change: 0 additions & 1 deletion elastic/changelog.d/19249.fixed

This file was deleted.

2 changes: 1 addition & 1 deletion elastic/datadog_checks/elastic/__about__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# All rights reserved
# Licensed under a 3-clause BSD style license (see LICENSE)

__version__ = "8.0.0"
__version__ = "8.0.1"
2 changes: 1 addition & 1 deletion requirements-agent-release.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ datadog-dotnetclr==4.0.0; sys_platform == 'win32'
datadog-druid==4.0.0
datadog-ecs-fargate==6.0.0
datadog-eks-fargate==6.0.0
datadog-elastic==8.0.0
datadog-elastic==8.0.1
datadog-envoy==5.0.0
datadog-esxi==3.0.0
datadog-etcd==8.0.0
Expand Down
4 changes: 2 additions & 2 deletions vsphere/assets/configuration/spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,8 @@ files:
description: |
The events that should be collected by the vSphere integration.
The "event" specifies the event type you want to include, and the "excluded_messages" is a list of
messages of that event type you do not want to collect. For example, if the key
The "event" specifies the event type you want to include, and optionally, the "excluded_messages" is
a list of messages of that event type you do not want to collect. For example, if the key
is 'AlarmStatusChangedEvent' and the values for this key are 'Gray to Green' and 'Green to Gray',
then all events named 'AlarmStatusChangedEvent' that don't have the message 'Gray to Green'
and 'Green to Gray' will be included.
Expand Down
2 changes: 1 addition & 1 deletion vsphere/datadog_checks/vsphere/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ def __init__(self, instance, init_config, log):
self.exclude_filters = {}
for item in self.include_events:
event_name = item["event"]
excluded_messages = [r'{}'.format(msg) for msg in item["excluded_messages"]]
excluded_messages = [r'{}'.format(msg) for msg in item.get("excluded_messages", [])]
self.exclude_filters[event_name] = excluded_messages

# Since `collect_per_instance_filters` have the same structure as `metric_filters` we use the same parser
Expand Down
4 changes: 2 additions & 2 deletions vsphere/datadog_checks/vsphere/data/conf.yaml.example
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,8 @@ instances:
## @param include_events - list of mappings - optional
## The events that should be collected by the vSphere integration.
##
## The "event" specifies the event type you want to include, and the "excluded_messages" is a list of
## messages of that event type you do not want to collect. For example, if the key
## The "event" specifies the event type you want to include, and optionally, the "excluded_messages" is
## a list of messages of that event type you do not want to collect. For example, if the key
## is 'AlarmStatusChangedEvent' and the values for this key are 'Gray to Green' and 'Green to Gray',
## then all events named 'AlarmStatusChangedEvent' that don't have the message 'Gray to Green'
## and 'Green to Gray' will be included.
Expand Down
24 changes: 24 additions & 0 deletions vsphere/tests/test_event.py
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,30 @@ def test_include_events_ok(aggregator, realtime_instance, dd_run_check, mock_api
assert aggregator.events[0]['msg_title'] == "[Triggered] alarm1 on VM vm1 is now red"


@pytest.mark.usefixtures('mock_type', 'mock_threadpool', 'mock_rest_api')
def test_include_events_no_excluded_message(aggregator, realtime_instance, dd_run_check, mock_api):
realtime_instance['include_events'] = [{"event": "AlarmStatusChangedEvent"}]
check = VSphereCheck('vsphere', {}, [realtime_instance])
event1 = vim.event.AlarmStatusChangedEvent()
event1.createdTime = dt.datetime.now()
event1.entity = vim.event.ManagedEntityEventArgument()
event1.entity.entity = vim.VirtualMachine(moId="vm1")
event1.entity.name = "vm1"
event1.alarm = vim.event.AlarmEventArgument()
event1.alarm.name = "alarm1"
setattr(event1, 'from', 'green')
event1.to = 'red'
event1.datacenter = vim.event.DatacenterEventArgument()
event1.datacenter.name = "dc1"
event1.fullFormattedMessage = "Green to Red"
mock_api.side_effect = mock_api_with_events([event1])

dd_run_check(check)

assert len(aggregator.events) == 1
assert aggregator.events[0]['msg_title'] == "[Triggered] alarm1 on VM vm1 is now red"


@pytest.mark.usefixtures('mock_type', 'mock_threadpool', 'mock_rest_api')
def test_include_events_filtered(aggregator, realtime_instance, dd_run_check, mock_api):
realtime_instance['include_events'] = [
Expand Down

0 comments on commit e6b5409

Please sign in to comment.