Skip to content

PMM-4145 Add RDS disable metrics checkboxes. #629

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

Merged
merged 15 commits into from
Apr 6, 2020
Merged

PMM-4145 Add RDS disable metrics checkboxes. #629

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ed35b1a
PMM-4145 Add RDS disable metrics checkboxes.
askomorokhov Mar 12, 2020
7b22672
PMM-4145 Show disable metrics only for RDS form.
askomorokhov Mar 16, 2020
5554ca0
PMM-4145 Remove blank line.
askomorokhov Mar 16, 2020
c535f2a
Merge branch 'PMM-2.0' into PMM-4145-rds-disable-metric-collection
AlekSi Mar 19, 2020
9c24e14
Merge branch 'PMM-2.0' into PMM-4145-rds-disable-metric-collection
lunaticusgreen Mar 24, 2020
350021a
Merge branch 'PMM-2.0' of github.com:percona/grafana-dashboards into …
askomorokhov Mar 24, 2020
53de53c
Merge branch 'PMM-2.0' into PMM-4145-rds-disable-metric-collection
AlekSi Mar 24, 2020
3b41bac
PMM-4145 Fix
askomorokhov Mar 24, 2020
4d3be88
Merge branch 'PMM-4145-rds-disable-metric-collection' of github.com:p…
askomorokhov Mar 24, 2020
e124fc0
Merge branch 'PMM-2.0' into PMM-4145-rds-disable-metric-collection
lunaticusgreen Mar 25, 2020
d437582
Merge branch 'PMM-2.0' into PMM-4145-rds-disable-metric-collection
lunaticusgreen Mar 26, 2020
5cae517
Merge branch 'PMM-2.0' of github.com:percona/grafana-dashboards into …
askomorokhov Mar 26, 2020
8c0dd76
Merge branch 'PMM-4145-rds-disable-metric-collection' of github.com:p…
askomorokhov Mar 26, 2020
026c345
Merge branch 'PMM-2.0' of github.com:percona/grafana-dashboards into …
askomorokhov Mar 31, 2020
25978a3
Merge branch 'PMM-2.0' into PMM-4145-rds-disable-metric-collection
askomorokhov Apr 6, 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
18 changes: 16 additions & 2 deletions pmm-app/src/pmm-add-instance-app-panel/AddInstance/AddRemoteInstance/AddRemoteInstance.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export const getInstanceData = (instanceType, credentials) => {
return instance;
};

const getAdditionalOptions = (type, form) => {
const getAdditionalOptions = (type, remoteInstanceCredentials, form) => {
switch (type) {
case 'PostgreSQL':
return (
Expand All @@ -70,6 +70,20 @@ const getAdditionalOptions = (type, form) => {
</>
);
case 'MySQL':
if (remoteInstanceCredentials.isRDS) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think about this? @lunaticusgreen

Suggested change
if (remoteInstanceCredentials.isRDS) {
return (
<>
<CheckboxField form={form} label={'Use performance schema'} name="qan_mysql_perfschema" />
<span className="description"></span>
(remoteInstanceCredentials.isRDS ? (
<CheckboxField form={form} label={'Disable Basic Metrics'} name="disable_basic_metrics" />
<span className="description"></span>
<CheckboxField form={form} label={'Disable Enhanced Metrics'} name="disable_enhanced_metrics" />
<span className="description"></span>
) : (Null))
</>
);

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@BupycHuk
There is no such thing as (Null) in js. What dit you mean?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks ok, but instead of Null you have to use null

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

null

return (
<>
<CheckboxField form={form} label="Use performance schema" name="qan_mysql_perfschema" />
<span className="description"></span>

<CheckboxField form={form} label="Disable Basic Metrics" name="disable_basic_metrics" />
<span className="description"></span>

<CheckboxField form={form} label="Disable Enhanced Metrics" name="disable_enhanced_metrics" />
<span className="description"></span>
</>
);
}
return (
<>
<CheckboxField form={form} label="Use performance schema" name="qan_mysql_perfschema" />
Expand Down Expand Up @@ -250,7 +264,7 @@ key2:value2"
data-cy="add-account-username"
/>
<span className="description"></span>
{getAdditionalOptions(instanceType, form)}
{getAdditionalOptions(instanceType, remoteInstanceCredentials, form)}
</div>

<div className="add-instance-form__submit-block">
Expand Down