diff --git a/prometheus-exporters/snmp-exporter/_snmp-exporter-thales.yaml b/prometheus-exporters/snmp-exporter/_snmp-exporter-thales.yaml index a0264971455..85079adb390 100644 --- a/prometheus-exporters/snmp-exporter/_snmp-exporter-thales.yaml +++ b/prometheus-exporters/snmp-exporter/_snmp-exporter-thales.yaml @@ -218,12 +218,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -241,12 +238,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -264,12 +258,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -287,12 +278,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -310,12 +298,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -333,12 +318,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -356,12 +338,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -385,12 +364,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -408,12 +384,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -435,12 +408,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -462,12 +432,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -485,12 +452,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -509,12 +473,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -532,12 +493,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -555,12 +513,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -578,12 +533,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -605,12 +557,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -632,12 +581,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -658,12 +604,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -681,12 +624,9 @@ indexes: - labelname: hsmSerialNumber type: DisplayString - lookups: - - labels: - - hsmSerialNumber - labelname: hsmPartitionLabel - oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 + - labelname: hsmPartitionSerialNumber type: DisplayString + lookups: - labels: - hsmSerialNumber labelname: hsmModel @@ -706,9 +646,11 @@ type: DisplayString - labelname: hsmPartitionSerialNumber type: DisplayString + - labelname: hsmPartitionSerialNumber + type: DisplayString lookups: - labels: - - hsmSerialNumber + - hsmPartitionSerialNumber labelname: hsmPartitionLabel oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 type: DisplayString @@ -731,9 +673,11 @@ type: DisplayString - labelname: hsmPartitionSerialNumber type: DisplayString + - labelname: hsmPartitionSerialNumber + type: DisplayString lookups: - labels: - - hsmSerialNumber + - hsmPartitionSerialNumber labelname: hsmPartitionLabel oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 type: DisplayString @@ -759,9 +703,11 @@ type: DisplayString - labelname: hsmPartitionSerialNumber type: DisplayString + - labelname: hsmPartitionSerialNumber + type: DisplayString lookups: - labels: - - hsmSerialNumber + - hsmPartitionSerialNumber labelname: hsmPartitionLabel oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 type: DisplayString @@ -784,9 +730,11 @@ type: DisplayString - labelname: hsmPartitionSerialNumber type: DisplayString + - labelname: hsmPartitionSerialNumber + type: DisplayString lookups: - labels: - - hsmSerialNumber + - hsmPartitionSerialNumber labelname: hsmPartitionLabel oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 type: DisplayString @@ -809,9 +757,11 @@ type: DisplayString - labelname: hsmPartitionSerialNumber type: DisplayString + - labelname: hsmPartitionSerialNumber + type: DisplayString lookups: - labels: - - hsmSerialNumber + - hsmPartitionSerialNumber labelname: hsmPartitionLabel oid: 1.3.6.1.4.1.23629.1.5.1.4.1.2 type: DisplayString diff --git a/prometheus-exporters/snmp-exporter/generator/thales-generator.yaml b/prometheus-exporters/snmp-exporter/generator/thales-generator.yaml index b323b61747e..8fa83094d4f 100644 --- a/prometheus-exporters/snmp-exporter/generator/thales-generator.yaml +++ b/prometheus-exporters/snmp-exporter/generator/thales-generator.yaml @@ -4,7 +4,7 @@ modules: lookups: - source_indexes: [lmTempSensorsIndex] lookup: lmTempSensorsDevice - - source_indexes: [hsmSerialNumber] + - source_indexes: [hsmPartitionSerialNumber] lookup: hsmPartitionLabel - source_indexes: [hsmClientName] lookup: hsmClientAddress diff --git a/system/opensearch-logs/.helmignore b/system/opensearch-logs/.helmignore index f0c13194444..3238c62446e 100644 --- a/system/opensearch-logs/.helmignore +++ b/system/opensearch-logs/.helmignore @@ -19,3 +19,6 @@ .project .idea/ *.tmproj +# Shell scripts and data files that shouldn't be rendered as templates +templates/export.sh +templates/dashboards/*.ndjson