Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion plugins/solidigm/solidigm-nvme.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include "cmd.h"

#define SOLIDIGM_PLUGIN_VERSION "1.18"
#define SOLIDIGM_PLUGIN_VERSION "1.19"

PLUGIN(NAME("solidigm", "Solidigm vendor specific extensions", SOLIDIGM_PLUGIN_VERSION),
COMMAND_LIST(
Expand Down
9 changes: 8 additions & 1 deletion plugins/solidigm/solidigm-telemetry/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include <json.h>

#include "config.h"
#include "telemetry-log.h"

#define NOT_FOUND "NOT_FOUND"

Expand All @@ -23,6 +24,7 @@
#define NLOG_OBJ_PREFIX OBJ_NAME_PREFIX "NLOG_"

static bool config_get_by_version(const struct json_object *obj,
const char *key,
int version_major, int version_minor,
struct json_object **value)
{
Expand All @@ -42,6 +44,10 @@ static bool config_get_by_version(const struct json_object *obj,
/* Try wildcard minor version if exact match failed */
if (json_object_object_get_ex(major_obj, "*", value))
return value != NULL;

SOLIDIGM_LOG_WARNING(
"Warning: Object %s version major %d found but minor %d not found\n",
key, version_major, version_minor);
}

/* Try wildcard major version if exact major version not found */
Expand All @@ -66,7 +72,8 @@ bool sldm_config_get_struct_by_key_version(const struct json_object *config, cha

if (!json_object_object_get_ex(config, key, &token))
return false;
if (!config_get_by_version(token, version_major, version_minor, value))
if (!config_get_by_version(token, key,
version_major, version_minor, value))
return false;
return value != NULL;
}
Expand Down
12 changes: 12 additions & 0 deletions plugins/solidigm/solidigm-telemetry/data-area.c
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,18 @@ int solidigm_telemetry_log_data_areas_parse(struct telemetry_log *tl,

solidigm_telemetry_log_da1_check_ocp(tl);
sldm_telemetry_da2_check_skhT(tl);
// if TELEMETRY_CONFIG_META available copy it to the output for better
// context in the output data
if (tl->configuration) {
struct json_object *config_meta = NULL;

if (json_object_object_get_ex(tl->configuration,
"TELEMETRY_CONFIG_META",
&config_meta))
json_object_object_add(tl->root,
"TELEMETRY_CONFIG_META",
config_meta);
}
solidigm_telemetry_log_header_parse(tl);
solidigm_telemetry_log_cod_parse(tl);
if (tl->configuration) {
Expand Down