|
60 | 60 | import com.cloud.storage.Volume; |
61 | 61 | import com.cloud.storage.VolumeVO; |
62 | 62 | import com.cloud.storage.dao.VolumeDao; |
63 | | -import com.cloud.utils.StringUtils; |
| 63 | +import org.apache.commons.lang3.StringUtils; |
64 | 64 | import com.cloud.utils.Ternary; |
65 | 65 | import com.cloud.utils.component.Manager; |
66 | 66 | import com.cloud.utils.component.ManagerBase; |
@@ -536,7 +536,7 @@ public ItemHost(final String zn, final String zu, final String st, int cnt, fina |
536 | 536 |
|
537 | 537 | @Override |
538 | 538 | public String toMetricsString() { |
539 | | - if (! Strings.isNullOrEmpty(hosttags)) { |
| 539 | + if (StringUtils.isNotEmpty(hosttags)) { |
540 | 540 | name = "cloudstack_hosts_total_by_tag"; |
541 | 541 | return String.format("%s{zone=\"%s\",filter=\"%s\",tags=\"%s\"} %d", name, zoneName, state, hosttags, total); |
542 | 542 | } |
@@ -573,7 +573,7 @@ public ItemVMCore(final String zn, final String zu, final String hn, final Strin |
573 | 573 | @Override |
574 | 574 | public String toMetricsString() { |
575 | 575 | if (StringUtils.isAllEmpty(hostName, ip)) { |
576 | | - if (Strings.isNullOrEmpty(hosttags)) { |
| 576 | + if (StringUtils.isEmpty(hosttags)) { |
577 | 577 | return String.format("%s{zone=\"%s\",filter=\"%s\"} %d", name, zoneName, filter, core); |
578 | 578 | } else { |
579 | 579 | name = "cloudstack_host_vms_cores_total_by_tag"; |
@@ -613,7 +613,7 @@ public ItemHostCpu(final String zn, final String zu, final String hn, final Stri |
613 | 613 | @Override |
614 | 614 | public String toMetricsString() { |
615 | 615 | if (StringUtils.isAllEmpty(hostName, ip)) { |
616 | | - if (Strings.isNullOrEmpty(hosttags)) { |
| 616 | + if (StringUtils.isEmpty(hosttags)) { |
617 | 617 | return String.format("%s{zone=\"%s\",filter=\"%s\"} %.2f", name, zoneName, filter, mhertz); |
618 | 618 | } else { |
619 | 619 | name = "cloudstack_host_cpu_usage_mhz_total_by_tag"; |
@@ -653,7 +653,7 @@ public ItemHostMemory(final String zn, final String zu, final String hn, final S |
653 | 653 | @Override |
654 | 654 | public String toMetricsString() { |
655 | 655 | if (StringUtils.isAllEmpty(hostName, ip)) { |
656 | | - if (Strings.isNullOrEmpty(hosttags)) { |
| 656 | + if (StringUtils.isEmpty(hosttags)) { |
657 | 657 | return String.format("%s{zone=\"%s\",filter=\"%s\"} %.2f", name, zoneName, filter, miBytes); |
658 | 658 | } else { |
659 | 659 | name = "cloudstack_host_memory_usage_mibs_total_by_tag"; |
|
0 commit comments