1 files changed, 21 insertions, 0 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_explorer.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_explorer.cpp
index 0b48afe4ab8..0797ddfb6cd 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_explorer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_manager_explorer.cpp
@@ -3,9 +3,13 @@
 #include "attribute_manager_explorer.h"
 #include "attribute_executor.h"
 #include "attribute_vector_explorer.h"
+#include "imported_attribute_vector_explorer.h"
+#include "imported_attributes_repo.h"
 #include <vespa/searchlib/attribute/attributevector.h>
+#include <vespa/searchlib/attribute/imported_attribute_vector.h>
 
 using search::AttributeVector;
+using search::attribute::ImportedAttributeVector;
 using vespalib::slime::Inserter;
 
 namespace proton {
@@ -32,6 +36,14 @@ AttributeManagerExplorer::get_children_names() const
     for (const auto &attr : attributes) {
         names.push_back(attr->getName());
     }
+    auto imported = _mgr->getImportedAttributes();
+    if (imported != nullptr) {
+        std::vector<std::shared_ptr<ImportedAttributeVector>> i_list;
+        imported->getAll(i_list);
+        for (const auto& attr : i_list) {
+            names.push_back(attr->getName());
+        }
+    }
     return names;
 }
 
@@ -39,6 +51,15 @@ std::unique_ptr<vespalib::StateExplorer>
 AttributeManagerExplorer::get_child(vespalib::stringref name) const
 {
     auto guard = _mgr->getAttribute(name);
+    if (!guard || !guard->getSP()) {
+        auto imported = _mgr->getImportedAttributes();
+        if (imported != nullptr) {
+            auto& imported_attr = imported->get(name);
+            if (imported_attr) {
+                return std::make_unique<ImportedAttributeVectorExplorer>(imported_attr);
+            }
+        }
+    }
     auto attr = guard ? guard->getSP() : std::shared_ptr<AttributeVector>();
     if (attr && _mgr->getWritableAttribute(name) != nullptr) {
         auto executor = std::make_unique<AttributeExecutor>(_mgr, std::move(attr));