Skip to content

Commit ffbaa06

Browse files
committed
Fix dashboards export, and don't explicitly include arkime_stats-v3 index pattern (the index template will handle its automatic creation by arkime)
1 parent a7c4912 commit ffbaa06

File tree

3 files changed

+41
-57
lines changed

3 files changed

+41
-57
lines changed

api/project/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,6 +1297,7 @@ def dashboard_export(dashid):
12971297
if doReplacers
12981298
else app.config['MALCOLM_OTHER_INDEX_PATTERN']
12991299
),
1300+
app.config['ARKIME_STATS_INDEX_PATTERN'],
13001301
]
13011302
)
13021303
)

api/project/config.py

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -5,48 +5,49 @@
55

66

77
class Config(object):
8-
ARKIME_FIELDS_INDEX = f"{os.getenv('ARKIME_FIELDS_INDEX', 'arkime_fields')}"
9-
MALCOLM_NETWORK_INDEX_PATTERN = f"{os.getenv('MALCOLM_NETWORK_INDEX_PATTERN', 'arkime_sessions3-*')}"
10-
MALCOLM_NETWORK_INDEX_TIME_FIELD = f"{os.getenv('MALCOLM_NETWORK_INDEX_TIME_FIELD', 'firstPacket')}"
11-
MALCOLM_OTHER_INDEX_PATTERN = f"{os.getenv('MALCOLM_OTHER_INDEX_PATTERN', 'malcolm_beats_*')}"
12-
MALCOLM_OTHER_INDEX_TIME_FIELD = f"{os.getenv('MALCOLM_OTHER_INDEX_TIME_FIELD', '@timestamp')}"
13-
ARKIME_NETWORK_INDEX_PATTERN = f"{os.getenv('ARKIME_NETWORK_INDEX_PATTERN', 'arkime_sessions3-*')}"
14-
ARKIME_NETWORK_INDEX_TIME_FIELD = f"{os.getenv('ARKIME_NETWORK_INDEX_TIME_FIELD', 'firstPacket')}"
8+
ARKIME_FIELDS_INDEX = os.getenv('ARKIME_FIELDS_INDEX', 'arkime_fields')
9+
MALCOLM_NETWORK_INDEX_PATTERN = os.getenv('MALCOLM_NETWORK_INDEX_PATTERN', 'arkime_sessions3-*')
10+
MALCOLM_NETWORK_INDEX_TIME_FIELD = os.getenv('MALCOLM_NETWORK_INDEX_TIME_FIELD', 'firstPacket')
11+
MALCOLM_OTHER_INDEX_PATTERN = os.getenv('MALCOLM_OTHER_INDEX_PATTERN', 'malcolm_beats_*')
12+
MALCOLM_OTHER_INDEX_TIME_FIELD = os.getenv('MALCOLM_OTHER_INDEX_TIME_FIELD', '@timestamp')
13+
ARKIME_NETWORK_INDEX_PATTERN = os.getenv('ARKIME_NETWORK_INDEX_PATTERN', 'arkime_sessions3-*')
14+
ARKIME_NETWORK_INDEX_TIME_FIELD = os.getenv('ARKIME_NETWORK_INDEX_TIME_FIELD', 'firstPacket')
15+
ARKIME_STATS_INDEX_PATTERN = "arkime_stats_*"
1516

16-
ARKIME_SSL = f"{os.getenv('ARKIME_SSL', 'true')}"
17-
ARKIME_HOST = f"{os.getenv('ARKIME_HOST', 'arkime')}"
18-
ARKIME_PORT = int(f"{os.getenv('ARKIME_VIEWER_PORT', os.getenv('ARKIME_PORT', '8005'))}".split(':')[-1])
19-
BUILD_DATE = f"{os.getenv('BUILD_DATE', 'unknown')}"
20-
DASHBOARDS_URL = f"{os.getenv('DASHBOARDS_URL', 'http://dashboards:5601/dashboards')}"
21-
DASHBOARDS_HELPER_HOST = f"{os.getenv('DASHBOARDS_HELPER_HOST', 'dashboards-helper')}"
22-
DASHBOARDS_MAPS_PORT = int(f"{os.getenv('DASHBOARDS_MAPS_PORT', '28991')}")
23-
DOCTYPE_DEFAULT = f"{os.getenv('DOCTYPE_DEFAULT', 'network')}"
24-
FILEBEAT_HOST = f"{os.getenv('FILEBEAT_HOST', 'filebeat')}"
25-
FILEBEAT_TCP_JSON_PORT = int(f"{os.getenv('FILEBEAT_TCP_JSON_PORT', '5045')}")
26-
FREQ_URL = f"{os.getenv('FREQ_URL', 'http://freq:10004')}"
27-
LOGSTASH_API_PORT = int(f"{os.getenv('LOGSTASH_API_PORT', '9600')}")
28-
LOGSTASH_HOST = f"{os.getenv('LOGSTASH_HOST', 'logstash')}"
29-
LOGSTASH_LJ_PORT = int(f"{os.getenv('LOGSTASH_LJ_PORT', '5044')}")
30-
MALCOLM_API_DEBUG = f"{os.getenv('MALCOLM_API_DEBUG', 'false')}"
31-
MALCOLM_API_PREFIX = f"{os.getenv('MALCOLM_API_PREFIX', 'mapi')}"
32-
MALCOLM_TEMPLATE = f"{os.getenv('MALCOLM_TEMPLATE', 'malcolm_template')}"
33-
MALCOLM_VERSION = f"{os.getenv('MALCOLM_VERSION', 'unknown')}"
17+
ARKIME_SSL = os.getenv('ARKIME_SSL', 'true')
18+
ARKIME_HOST = os.getenv('ARKIME_HOST', 'arkime')
19+
ARKIME_PORT = int(os.getenv('ARKIME_VIEWER_PORT', os.getenv('ARKIME_PORT', '8005')).split(':')[-1])
20+
BUILD_DATE = os.getenv('BUILD_DATE', 'unknown')
21+
DASHBOARDS_URL = os.getenv('DASHBOARDS_URL', 'http://dashboards:5601/dashboards')
22+
DASHBOARDS_HELPER_HOST = os.getenv('DASHBOARDS_HELPER_HOST', 'dashboards-helper')
23+
DASHBOARDS_MAPS_PORT = int(os.getenv('DASHBOARDS_MAPS_PORT', '28991'))
24+
DOCTYPE_DEFAULT = os.getenv('DOCTYPE_DEFAULT', 'network')
25+
FILEBEAT_HOST = os.getenv('FILEBEAT_HOST', 'filebeat')
26+
FILEBEAT_TCP_JSON_PORT = int(os.getenv('FILEBEAT_TCP_JSON_PORT', '5045'))
27+
FREQ_URL = os.getenv('FREQ_URL', 'http://freq:10004')
28+
LOGSTASH_API_PORT = int(os.getenv('LOGSTASH_API_PORT', '9600'))
29+
LOGSTASH_HOST = os.getenv('LOGSTASH_HOST', 'logstash')
30+
LOGSTASH_LJ_PORT = int(os.getenv('LOGSTASH_LJ_PORT', '5044'))
31+
MALCOLM_API_DEBUG = os.getenv('MALCOLM_API_DEBUG', 'false')
32+
MALCOLM_API_PREFIX = os.getenv('MALCOLM_API_PREFIX', 'mapi')
33+
MALCOLM_TEMPLATE = os.getenv('MALCOLM_TEMPLATE', 'malcolm_template')
34+
MALCOLM_VERSION = os.getenv('MALCOLM_VERSION', 'unknown')
3435
NETBOX_URL = os.getenv('NETBOX_URL') or 'http://netbox:8080/netbox'
35-
NETBOX_TOKEN = f"{os.getenv('NETBOX_TOKEN') or os.getenv('SUPERUSER_API_TOKEN', '')}"
36-
OPENSEARCH_CREDS_CONFIG_FILE = (
37-
f"{os.getenv('OPENSEARCH_CREDS_CONFIG_FILE', '/var/local/curlrc/.opensearch.primary.curlrc')}"
36+
NETBOX_TOKEN = os.getenv('NETBOX_TOKEN') or os.getenv('SUPERUSER_API_TOKEN', '')
37+
OPENSEARCH_CREDS_CONFIG_FILE = os.getenv(
38+
'OPENSEARCH_CREDS_CONFIG_FILE', '/var/local/curlrc/.opensearch.primary.curlrc'
3839
)
39-
OPENSEARCH_PRIMARY = f"{os.getenv('OPENSEARCH_PRIMARY', 'opensearch-local')}"
40-
OPENSEARCH_SSL_CERTIFICATE_VERIFICATION = f"{os.getenv('OPENSEARCH_SSL_CERTIFICATE_VERIFICATION', 'false')}"
41-
OPENSEARCH_URL = f"{os.getenv('OPENSEARCH_URL', 'https://opensearch:9200')}"
42-
PCAP_MONITOR_HOST = f"{os.getenv('PCAP_MONITOR_HOST', 'pcap-monitor')}"
43-
PCAP_TOPIC_PORT = int(f"{os.getenv('PCAP_TOPIC_PORT', '30441')}")
44-
RESULT_SET_LIMIT = int(f"{os.getenv('RESULT_SET_LIMIT', '500')}")
45-
VCS_REVISION = f"{os.getenv('VCS_REVISION', 'unknown')}"
46-
ZEEK_EXTRACTED_FILE_LOGGER_HOST = f"{os.getenv('ZEEK_EXTRACTED_FILE_LOGGER_HOST', 'file-monitor')}"
47-
ZEEK_EXTRACTED_FILE_LOGGER_TOPIC_PORT = int(f"{os.getenv('ZEEK_EXTRACTED_FILE_LOGGER_TOPIC_PORT', '5988')}")
48-
ZEEK_EXTRACTED_FILE_MONITOR_HOST = f"{os.getenv('ZEEK_EXTRACTED_FILE_MONITOR_HOST', 'file-monitor')}"
49-
ZEEK_EXTRACTED_FILE_TOPIC_PORT = int(f"{os.getenv('ZEEK_EXTRACTED_FILE_TOPIC_PORT', '5987')}")
40+
OPENSEARCH_PRIMARY = os.getenv('OPENSEARCH_PRIMARY', 'opensearch-local')
41+
OPENSEARCH_SSL_CERTIFICATE_VERIFICATION = os.getenv('OPENSEARCH_SSL_CERTIFICATE_VERIFICATION', 'false')
42+
OPENSEARCH_URL = os.getenv('OPENSEARCH_URL', 'https://opensearch:9200')
43+
PCAP_MONITOR_HOST = os.getenv('PCAP_MONITOR_HOST', 'pcap-monitor')
44+
PCAP_TOPIC_PORT = int(os.getenv('PCAP_TOPIC_PORT', '30441'))
45+
RESULT_SET_LIMIT = int(os.getenv('RESULT_SET_LIMIT', '500'))
46+
VCS_REVISION = os.getenv('VCS_REVISION', 'unknown')
47+
ZEEK_EXTRACTED_FILE_LOGGER_HOST = os.getenv('ZEEK_EXTRACTED_FILE_LOGGER_HOST', 'file-monitor')
48+
ZEEK_EXTRACTED_FILE_LOGGER_TOPIC_PORT = int(os.getenv('ZEEK_EXTRACTED_FILE_LOGGER_TOPIC_PORT', '5988'))
49+
ZEEK_EXTRACTED_FILE_MONITOR_HOST = os.getenv('ZEEK_EXTRACTED_FILE_MONITOR_HOST', 'file-monitor')
50+
ZEEK_EXTRACTED_FILE_TOPIC_PORT = int(os.getenv('ZEEK_EXTRACTED_FILE_TOPIC_PORT', '5987'))
5051

5152
ROLE_BASED_ACCESS = os.getenv('ROLE_BASED_ACCESS', 'false')
5253
ROLE_ADMIN = os.getenv('ROLE_ADMIN', '')

dashboards/dashboards/beats/4ca94c70-d7da-11ee-9ed3-e7afff29e59a.json

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -614,24 +614,6 @@
614614
"type": "search",
615615
"updated_at": "2025-08-25T14:54:49.880Z",
616616
"version": "WzEwMzIsMV0="
617-
},
618-
{
619-
"attributes": {
620-
"fields": "[{\"count\":0,\"name\":\"_id\",\"type\":\"string\",\"esTypes\":[\"_id\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"count\":0,\"name\":\"_index\",\"type\":\"string\",\"esTypes\":[\"_index\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"count\":0,\"name\":\"_score\",\"type\":\"number\",\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"_source\",\"type\":\"_source\",\"esTypes\":[\"_source\"],\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"_type\",\"type\":\"string\",\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"closeQueue\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"cpu\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":1,\"name\":\"currentTime\",\"type\":\"date\",\"esTypes\":[\"date\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"deltaBytes\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"deltaDropped\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"deltaDupDropped\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"deltaESDropped\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"deltaFragsDropped\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"deltaMS\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"deltaOverloadDropped\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"deltaPackets\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"deltaSessionBytes\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"deltaSessions\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"deltaUnwrittenBytes\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"deltaWrittenBytes\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"diskQueue\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"esHealthMS\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"esQueue\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"espSessions\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"frags\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"fragsQueue\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"freeSpaceM\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"freeSpaceP\",\"type\":\"number\",\"esTypes\":[\"float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":1,\"name\":\"hostname\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"icmpSessions\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"interval\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"memory\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"memoryP\",\"type\":\"number\",\"esTypes\":[\"float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"monitoring\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"needSave\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":1,\"name\":\"nodeName\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"otherSessions\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"packetQueue\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"sctpSessions\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"startTime\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"tcpSessions\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"totalDropped\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":1,\"name\":\"totalK\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":1,\"name\":\"totalPackets\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":1,\"name\":\"totalSessions\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"udpSessions\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"usedSpaceM\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"ver\",\"type\":\"string\",\"esTypes\":[\"text\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"ver.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"ver\"}}}]",
621-
"timeFieldName": null,
622-
"title": "arkime_stats_*"
623-
},
624-
"id": "arkime_stats_*",
625-
"migrationVersion": {
626-
"index-pattern": "7.6.0"
627-
},
628-
"namespaces": [
629-
"default"
630-
],
631-
"references": [],
632-
"type": "index-pattern",
633-
"updated_at": "2025-08-26T15:29:11.296Z",
634-
"version": "WzExNjYsNV0="
635617
}
636618
],
637619
"version": "3.1.0"

0 commit comments

Comments
 (0)