Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert/Remove unnecessary database_name config #7049

Merged
merged 2 commits into from
Jul 3, 2020
Merged

Revert/Remove unnecessary database_name config #7049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a76c24
Revert "Allow proxysql checks to specify stats database name (#6835)"
AlexandreYang Jul 2, 2020
28a9fc3
Keep removal of stats. prefix and tests
AlexandreYang Jul 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions proxysql/assets/configuration/spec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,6 @@ files:
value:
type: string
example: <PROXYSQL_ADMIN_PASSWORD>
- name: database_name
required: false
description: |
Sets the name of the database to query for stats. For proxysql admin users, this is "stats" (default).
For stats users (defined in Proxysql's admin-stats_credentials), this is "main".
See https://github.com/sysown/proxysql/issues/1661 for more details.
value:
type: string
example: stats
- name: tls_verify
value:
example: false
Expand Down
7 changes: 0 additions & 7 deletions proxysql/datadog_checks/proxysql/data/conf.yaml.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,6 @@ instances:
#
password: <PROXYSQL_ADMIN_PASSWORD>

## @param database_name - string - optional - default: stats
## Sets the name of the database to query for stats. For proxysql admin users, this is "stats" (default).
## For stats users (defined in Proxysql's admin-stats_credentials), this is "main".
## See https://github.com/sysown/proxysql/issues/1661 for more details.
#
# database_name: stats

## @param tls_verify - boolean - optional - default: false
## Instructs the check to use SSL when connecting to ProxySQL
#
Expand Down
2 changes: 0 additions & 2 deletions proxysql/datadog_checks/proxysql/proxysql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ def __init__(self, name, init_config, instances):
if not all((self.host, self.port, self.user, self.password)):
raise ConfigurationError("ProxySQL host, port, username and password are needed")

self.database_name = self.instance.get("database_name", "stats")
self.tls_verify = self.instance.get("tls_verify", False)
self.validate_hostname = self.instance.get("validate_hostname", True)
self.tls_ca_cert = self.instance.get("tls_ca_cert")
Expand Down Expand Up @@ -103,7 +102,6 @@ def connect(self):
user=self.user,
port=self.port,
passwd=self.password,
database=self.database_name,
connect_timeout=self.connect_timeout,
read_timeout=self.read_timeout,
ssl=ssl_context,
Expand Down