Revert "api: query_url_metadata: optionally detect compression"

[pve-manager.git] / PVE / API2Tools.pm

diff --git a/PVE/API2Tools.pm b/PVE/API2Tools.pm
index 4218c406aa3b831ba206f0e6e996729d074882f0..a3d7ca84cd3f9d5eee6d4bdd3f6791fb457f005c 100644 (file)
--- a/PVE/API2Tools.pm
+++ b/PVE/API2Tools.pm
@@ -14,6 +14,7 @@ use Digest::MD5 qw(md5_hex);
 use URI;
 use URI::Escape;
 use PVE::SafeSyslog;
+use PVE::Storage::Plugin;
 
 my $hwaddress;
 
@@ -120,13 +121,17 @@ sub extract_vm_stats {
 sub extract_storage_stats {
     my ($storeid, $scfg, $node, $rrd) = @_;
 
+    my $content = PVE::Storage::Plugin::content_hash_to_string($scfg->{content});
+
     my $entry = {
        id => "storage/$node/$storeid",
        storage => $storeid,
        node => $node,
        type => 'storage',
+       plugintype => $scfg->{type},
        status => 'unknown',
        shared => $scfg->{shared} || 0,
+       content => $content,
     };
 
     if (my $d = $rrd->{"pve2-storage/$node/$storeid"}) {
@@ -227,7 +232,7 @@ sub resolve_proxyto {
            if !$node;
     } else {
        $node = $uri_param->{$proxyto};
-       raise_param_exc({ $proxyto =>  "proxyto parameter does not exists"})
+       raise_param_exc({ $proxyto =>  "proxyto parameter does not exist"})
            if !$node;
     }
     return $node;