diff --git a/search/search.py b/search/search.py index 2ef5319..2410ce1 100644 --- a/search/search.py +++ b/search/search.py @@ -354,8 +354,7 @@ class ElasticSearchEngine(SearchEngine): stats["es_search_time"] = es_stats["indices"][self.index_name]["total"]["search"]["query_time_in_millis"] stats["es_search_time_avg"] = stats["es_search_time"] / ( stats["es_search_count"] if stats["es_search_count"] != 0 else 1) - stats["total_count"] = es_stats["indices"][self.index_name]["total"]["indexing"]["index_total"] - stats["total_count_nonzero"] = total_stats["hits"]["total"] + stats["total_count"] = total_stats["hits"]["total"] stats["total_size"] = total_stats["aggregations"]["file_stats"]["sum"] stats["size_avg"] = total_stats["aggregations"]["file_stats"]["avg"] stats["size_std_deviation"] = total_stats["aggregations"]["file_stats"]["std_deviation"] diff --git a/static/js/report.js b/static/js/report.js index 6616b02..b7de945 100644 --- a/static/js/report.js +++ b/static/js/report.js @@ -73,8 +73,6 @@ function drawWebsiteScatter(rData) { tooltips: { callbacks: { label: function(tooltipItem, data) { - console.log(tooltipItem); - console.log(data); return data.labels[tooltipItem.index]; } } @@ -271,7 +269,6 @@ function fillDatabaseTable(rData) { document.getElementById("esSearchTime").innerHTML = rData["es_search_time"] + "ms"; document.getElementById("esSearchTimeAvg").innerHTML = rData["es_search_time_avg"].toFixed(2) + "ms"; document.getElementById("totalCount").innerHTML = rData["total_count"]; - document.getElementById("totalCountNonzero").innerText = rData["total_count_nonzero"]; document.getElementById("totalSize").innerHTML = humanFileSize(rData["total_size"]); document.getElementById("sizeAvg").innerHTML = humanFileSize(rData["size_avg"]); document.getElementById("sizeStdDeviation").innerHTML = humanFileSize(rData["size_std_deviation"]); diff --git a/templates/stats.html b/templates/stats.html index 0795d00..9771849 100644 --- a/templates/stats.html +++ b/templates/stats.html @@ -47,10 +47,6 @@ Total file count - - File count with known size - - Size total