Skip to content

Commit af18d36

Browse files
Stop using simplejson and use the standard library instead (#2627)
1 parent d05861e commit af18d36

File tree

8 files changed

+25
-5
lines changed

8 files changed

+25
-5
lines changed

aqua/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# CHANGELOG - Aqua
22

3+
## 1.0.1 / 2025-03-17
4+
5+
* Stop using simplejson and use the standard library instead
6+
37
## 1.0.0 / 2018-12-11
48

59
***Added***:

aqua/datadog_checks/aqua/__about__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# (C) Datadog, Inc. 2018
22
# All rights reserved
33
# Licensed under a 3-clause BSD style license (see LICENSE)
4-
__version__ = '1.0.0'
4+
__version__ = '1.0.1'

aqua/datadog_checks/aqua/aqua.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# (C) Datadog, Inc. 2018
22
# All rights reserved
33
# Licensed under a 3-clause BSD style license (see LICENSE)
4-
import simplejson as json
4+
import json
5+
56
from six.moves.urllib.parse import urljoin
67

78
from datadog_checks.base import AgentCheck, ConfigurationError

puma/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# CHANGELOG - puma
22

3+
## 1.2.2 / 2025-03-17
4+
5+
* Stop using simplejson and use the standard library instead
6+
37
## 1.2.1 / 2023-10-05
48

59
***Fixed***:

puma/datadog_checks/puma/__about__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '1.2.1'
1+
__version__ = '1.2.2'

puma/datadog_checks/puma/data/conf.yaml.example

+10
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,16 @@ instances:
306306
# - TLSv1.2
307307
# - TLSv1.3
308308

309+
## @param tls_ciphers - list of strings - optional
310+
## The list of ciphers suites to use when connecting to an endpoint. If not specified,
311+
## `ALL` ciphers are used. For list of ciphers see:
312+
## https://www.openssl.org/docs/man1.0.2/man1/ciphers.html
313+
#
314+
# tls_ciphers:
315+
# - TLS_AES_256_GCM_SHA384
316+
# - TLS_CHACHA20_POLY1305_SHA256
317+
# - TLS_AES_128_GCM_SHA256
318+
309319
## @param headers - mapping - optional
310320
## The headers parameter allows you to send specific headers with every request.
311321
## You can use it for explicitly specifying the host header or adding headers for

puma/datadog_checks/puma/puma.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import simplejson as json
1+
import json
2+
23
from six.moves.urllib.parse import urlparse
34

45
from datadog_checks.base import AgentCheck, ConfigurationError

puma/tests/test_puma.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import json
12
import time
23

34
import pytest
45
import requests
5-
import simplejson as json
66
from mock import MagicMock, Mock
77

88
from datadog_checks.base import ConfigurationError

0 commit comments

Comments
 (0)