rpms
/
zabbix-agent-addons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small fixes in elasticsearch scripts

This commit is contained in:
Daniel Berteaud 2021-10-18 12:18:37 +02:00
parent 6dc46b819f
commit 9ad6d8b1b3
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zabbix_scripts/check_elasticsearch
View File

@ -22,8 +22,8 @@ my $pretty = 0;
my $json = {};
GetOptions (
'user=s' => \$user,
'password|p=s' => \$pass,
'user:s' => \$user,
'password:s' => \$pass,
'url=s' => \$url,
'cert-check!' => \$certcheck,
'cluster' => \$cluster,
@ -61,6 +61,7 @@ if (not $certcheck){
my $ua = LWP::UserAgent->new(
ssl_opts => $sslopts
);
$ua->env_proxy;
if ($cluster){
$json = make_request('/_cluster/stats');
@ -76,7 +77,7 @@ sub make_request {
my $path = shift;
my $req_url = $url . $path;
my $req = GET $req_url;
if (defined $user and defined $pass){
if (defined $user and $user ne '' and defined $pass and $pass ne ''){
$req->authorization_basic($user, $pass);
}
my $resp = $ua->request($req);

7
zabbix_scripts/disco_elasticsearch
View File

@ -21,8 +21,8 @@ my $pretty = 0;
my $json = [];
GetOptions (
'user=s' => \$user,
'password|p=s' => \$pass,
'user:s' => \$user,
'password:s' => \$pass,
'url=s' => \$url,
'cert-check!' => \$certcheck,
'nodes' => \$nodes,
@ -57,6 +57,7 @@ if (not $certcheck){
my $ua = LWP::UserAgent->new(
ssl_opts => $sslopts
);
$ua->env_proxy;
if ($nodes){
foreach (@{make_request('/_cat/nodes?format=json')}){
@ -81,7 +82,7 @@ sub make_request {
my $path = shift;
my $req_url = $url . $path;
my $req = GET $req_url;
if (defined $user and defined $pass){
if (defined $user and $user ne '' and defined $pass and $pass ne ''){
$req->authorization_basic($user, $pass);
}
my $resp = $ua->request($req);