Qstick
3 years ago
parent
01e7e924c4
commit
a61d4ab88c
@ -0,0 +1,37 @@
|
||||
import PropTypes from 'prop-types';
|
||||
import React from 'react';
|
||||
import FilterMenu from 'Components/Menu/FilterMenu';
|
||||
import { align } from 'Helpers/Props';
|
||||
|
||||
function StatsFilterMenu(props) {
|
||||
const {
|
||||
selectedFilterKey,
|
||||
filters,
|
||||
isDisabled,
|
||||
onFilterSelect
|
||||
} = props;
|
||||
|
||||
return (
|
||||
<FilterMenu
|
||||
alignMenu={align.RIGHT}
|
||||
isDisabled={isDisabled}
|
||||
selectedFilterKey={selectedFilterKey}
|
||||
filters={filters}
|
||||
customFilters={[]}
|
||||
onFilterSelect={onFilterSelect}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
StatsFilterMenu.propTypes = {
|
||||
selectedFilterKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
|
||||
filters: PropTypes.arrayOf(PropTypes.object).isRequired,
|
||||
isDisabled: PropTypes.bool.isRequired,
|
||||
onFilterSelect: PropTypes.func.isRequired
|
||||
};
|
||||
|
||||
StatsFilterMenu.defaultProps = {
|
||||
showCustomFilters: false
|
||||
};
|
||||
|
||||
export default StatsFilterMenu;
|
||||
@ -0,0 +1,24 @@
|
||||
import { connect } from 'react-redux';
|
||||
import { createSelector } from 'reselect';
|
||||
import FilterModal from 'Components/Filter/FilterModal';
|
||||
import { setIndexerStatsFilter } from 'Store/Actions/indexerStatsActions';
|
||||
|
||||
function createMapStateToProps() {
|
||||
return createSelector(
|
||||
(state) => state.indexerStats.items,
|
||||
(state) => state.indexerStats.filterBuilderProps,
|
||||
(sectionItems, filterBuilderProps) => {
|
||||
return {
|
||||
sectionItems,
|
||||
filterBuilderProps,
|
||||
customFilterType: 'indexerStats'
|
||||
};
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
const mapDispatchToProps = {
|
||||
dispatchSetFilter: setIndexerStatsFilter
|
||||
};
|
||||
|
||||
export default connect(createMapStateToProps, mapDispatchToProps)(FilterModal);
|
||||
@ -1,103 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Dapper;
|
||||
using NzbDrone.Core.Datastore;
|
||||
using NzbDrone.Core.Indexers;
|
||||
|
||||
namespace NzbDrone.Core.IndexerStats
|
||||
{
|
||||
public interface IIndexerStatisticsRepository
|
||||
{
|
||||
List<IndexerStatistics> IndexerStatistics();
|
||||
List<UserAgentStatistics> UserAgentStatistics();
|
||||
List<HostStatistics> HostStatistics();
|
||||
}
|
||||
|
||||
public class IndexerStatisticsRepository : IIndexerStatisticsRepository
|
||||
{
|
||||
private const string _selectTemplate = "SELECT /**select**/ FROM History /**join**/ /**innerjoin**/ /**leftjoin**/ /**where**/ /**groupby**/ /**having**/ /**orderby**/";
|
||||
|
||||
private readonly IMainDatabase _database;
|
||||
|
||||
public IndexerStatisticsRepository(IMainDatabase database)
|
||||
{
|
||||
_database = database;
|
||||
}
|
||||
|
||||
public List<IndexerStatistics> IndexerStatistics()
|
||||
{
|
||||
var time = DateTime.UtcNow;
|
||||
return Query(IndexerBuilder());
|
||||
}
|
||||
|
||||
public List<UserAgentStatistics> UserAgentStatistics()
|
||||
{
|
||||
var time = DateTime.UtcNow;
|
||||
return UserAgentQuery(UserAgentBuilder());
|
||||
}
|
||||
|
||||
public List<HostStatistics> HostStatistics()
|
||||
{
|
||||
var time = DateTime.UtcNow;
|
||||
return HostQuery(HostBuilder());
|
||||
}
|
||||
|
||||
private List<IndexerStatistics> Query(SqlBuilder builder)
|
||||
{
|
||||
var sql = builder.AddTemplate(_selectTemplate).LogQuery();
|
||||
|
||||
using (var conn = _database.OpenConnection())
|
||||
{
|
||||
return conn.Query<IndexerStatistics>(sql.RawSql, sql.Parameters).ToList();
|
||||
}
|
||||
}
|
||||
|
||||
private List<UserAgentStatistics> UserAgentQuery(SqlBuilder builder)
|
||||
{
|
||||
var sql = builder.AddTemplate(_selectTemplate).LogQuery();
|
||||
|
||||
using (var conn = _database.OpenConnection())
|
||||
{
|
||||
return conn.Query<UserAgentStatistics>(sql.RawSql, sql.Parameters).ToList();
|
||||
}
|
||||
}
|
||||
|
||||
private List<HostStatistics> HostQuery(SqlBuilder builder)
|
||||
{
|
||||
var sql = builder.AddTemplate(_selectTemplate).LogQuery();
|
||||
|
||||
using (var conn = _database.OpenConnection())
|
||||
{
|
||||
return conn.Query<HostStatistics>(sql.RawSql, sql.Parameters).ToList();
|
||||
}
|
||||
}
|
||||
|
||||
private SqlBuilder IndexerBuilder() => new SqlBuilder()
|
||||
.Select(@"Indexers.Id AS IndexerId,
|
||||
Indexers.Name AS IndexerName,
|
||||
SUM(CASE WHEN EventType == 2 then 1 else 0 end) AS NumberOfQueries,
|
||||
SUM(CASE WHEN EventType == 2 AND Successful == 0 then 1 else 0 end) AS NumberOfFailedQueries,
|
||||
SUM(CASE WHEN EventType == 3 then 1 else 0 end) AS NumberOfRssQueries,
|
||||
SUM(CASE WHEN EventType == 3 AND Successful == 0 then 1 else 0 end) AS NumberOfFailedRssQueries,
|
||||
SUM(CASE WHEN EventType == 4 then 1 else 0 end) AS NumberOfAuthQueries,
|
||||
SUM(CASE WHEN EventType == 4 AND Successful == 0 then 1 else 0 end) AS NumberOfFailedAuthQueries,
|
||||
SUM(CASE WHEN EventType == 1 then 1 else 0 end) AS NumberOfGrabs,
|
||||
SUM(CASE WHEN EventType == 1 AND Successful == 0 then 1 else 0 end) AS NumberOfFailedGrabs,
|
||||
AVG(json_extract(History.Data,'$.elapsedTime')) AS AverageResponseTime")
|
||||
.Join<History.History, IndexerDefinition>((t, r) => t.IndexerId == r.Id)
|
||||
.GroupBy<IndexerDefinition>(x => x.Id);
|
||||
|
||||
private SqlBuilder UserAgentBuilder() => new SqlBuilder()
|
||||
.Select(@"json_extract(History.Data,'$.source') AS UserAgent,
|
||||
SUM(CASE WHEN EventType == 2 OR EventType == 3 then 1 else 0 end) AS NumberOfQueries,
|
||||
SUM(CASE WHEN EventType == 1 then 1 else 0 end) AS NumberOfGrabs")
|
||||
.GroupBy("UserAgent");
|
||||
|
||||
private SqlBuilder HostBuilder() => new SqlBuilder()
|
||||
.Select(@"json_extract(History.Data,'$.host') AS Host,
|
||||
SUM(CASE WHEN EventType == 2 OR EventType == 3 then 1 else 0 end) AS NumberOfQueries,
|
||||
SUM(CASE WHEN EventType == 1 then 1 else 0 end) AS NumberOfGrabs")
|
||||
.GroupBy("Host");
|
||||
}
|
||||
}
|
||||
@ -1,43 +1,174 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using NzbDrone.Core.History;
|
||||
using NzbDrone.Core.Indexers;
|
||||
|
||||
namespace NzbDrone.Core.IndexerStats
|
||||
{
|
||||
public interface IIndexerStatisticsService
|
||||
{
|
||||
List<IndexerStatistics> IndexerStatistics();
|
||||
List<UserAgentStatistics> UserAgentStatistics();
|
||||
List<HostStatistics> HostStatistics();
|
||||
CombinedStatistics IndexerStatistics(DateTime start, DateTime end);
|
||||
}
|
||||
|
||||
public class IndexerStatisticsService : IIndexerStatisticsService
|
||||
{
|
||||
private readonly IIndexerStatisticsRepository _indexerStatisticsRepository;
|
||||
private readonly IIndexerFactory _indexerFactory;
|
||||
private readonly IHistoryService _historyService;
|
||||
|
||||
public IndexerStatisticsService(IIndexerStatisticsRepository indexerStatisticsRepository)
|
||||
public IndexerStatisticsService(IHistoryService historyService, IIndexerFactory indexerFactory)
|
||||
{
|
||||
_indexerStatisticsRepository = indexerStatisticsRepository;
|
||||
_historyService = historyService;
|
||||
_indexerFactory = indexerFactory;
|
||||
}
|
||||
|
||||
public List<IndexerStatistics> IndexerStatistics()
|
||||
public CombinedStatistics IndexerStatistics(DateTime start, DateTime end)
|
||||
{
|
||||
var indexerStatistics = _indexerStatisticsRepository.IndexerStatistics();
|
||||
var history = _historyService.Between(start, end);
|
||||
|
||||
return indexerStatistics.ToList();
|
||||
}
|
||||
var groupedByIndexer = history.GroupBy(h => h.IndexerId);
|
||||
var groupedByUserAgent = history.GroupBy(h => h.Data.GetValueOrDefault("source") ?? "");
|
||||
var groupedByHost = history.GroupBy(h => h.Data.GetValueOrDefault("host") ?? "");
|
||||
|
||||
public List<UserAgentStatistics> UserAgentStatistics()
|
||||
{
|
||||
var userAgentStatistics = _indexerStatisticsRepository.UserAgentStatistics();
|
||||
var indexerStatsList = new List<IndexerStatistics>();
|
||||
var userAgentStatsList = new List<UserAgentStatistics>();
|
||||
var hostStatsList = new List<HostStatistics>();
|
||||
|
||||
return userAgentStatistics.ToList();
|
||||
}
|
||||
var indexers = _indexerFactory.All();
|
||||
|
||||
public List<HostStatistics> HostStatistics()
|
||||
{
|
||||
var hostStatistics = _indexerStatisticsRepository.HostStatistics();
|
||||
foreach (var indexer in groupedByIndexer)
|
||||
{
|
||||
var indexerDef = indexers.SingleOrDefault(i => i.Id == indexer.Key);
|
||||
|
||||
if (indexerDef == null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var indexerStats = new IndexerStatistics
|
||||
{
|
||||
IndexerId = indexer.Key,
|
||||
IndexerName = indexerDef.Name
|
||||
};
|
||||
|
||||
var sortedEvents = indexer.OrderBy(v => v.Date)
|
||||
.ThenBy(v => v.Id)
|
||||
.ToArray();
|
||||
|
||||
indexerStats.AverageResponseTime = (int)sortedEvents.Where(h => h.Data.ContainsKey("elapsedTime")).Select(h => int.Parse(h.Data.GetValueOrDefault("elapsedTime"))).Average();
|
||||
|
||||
foreach (var historyEvent in sortedEvents)
|
||||
{
|
||||
var failed = !historyEvent.Successful;
|
||||
switch (historyEvent.EventType)
|
||||
{
|
||||
case HistoryEventType.IndexerQuery:
|
||||
indexerStats.NumberOfQueries++;
|
||||
if (failed)
|
||||
{
|
||||
indexerStats.NumberOfFailedQueries++;
|
||||
}
|
||||
|
||||
break;
|
||||
case HistoryEventType.IndexerAuth:
|
||||
indexerStats.NumberOfAuthQueries++;
|
||||
if (failed)
|
||||
{
|
||||
indexerStats.NumberOfFailedAuthQueries++;
|
||||
}
|
||||
|
||||
break;
|
||||
case HistoryEventType.ReleaseGrabbed:
|
||||
indexerStats.NumberOfGrabs++;
|
||||
if (failed)
|
||||
{
|
||||
indexerStats.NumberOfFailedGrabs++;
|
||||
}
|
||||
|
||||
break;
|
||||
case HistoryEventType.IndexerRss:
|
||||
indexerStats.NumberOfRssQueries++;
|
||||
if (failed)
|
||||
{
|
||||
indexerStats.NumberOfFailedRssQueries++;
|
||||
}
|
||||
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
indexerStatsList.Add(indexerStats);
|
||||
}
|
||||
|
||||
foreach (var indexer in groupedByUserAgent)
|
||||
{
|
||||
var indexerStats = new UserAgentStatistics
|
||||
{
|
||||
UserAgent = indexer.Key
|
||||
};
|
||||
|
||||
var sortedEvents = indexer.OrderBy(v => v.Date)
|
||||
.ThenBy(v => v.Id)
|
||||
.ToArray();
|
||||
|
||||
foreach (var historyEvent in sortedEvents)
|
||||
{
|
||||
switch (historyEvent.EventType)
|
||||
{
|
||||
case HistoryEventType.IndexerRss:
|
||||
case HistoryEventType.IndexerQuery:
|
||||
indexerStats.NumberOfQueries++;
|
||||
|
||||
break;
|
||||
case HistoryEventType.ReleaseGrabbed:
|
||||
indexerStats.NumberOfGrabs++;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
userAgentStatsList.Add(indexerStats);
|
||||
}
|
||||
|
||||
foreach (var indexer in groupedByHost)
|
||||
{
|
||||
var indexerStats = new HostStatistics
|
||||
{
|
||||
Host = indexer.Key
|
||||
};
|
||||
|
||||
var sortedEvents = indexer.OrderBy(v => v.Date)
|
||||
.ThenBy(v => v.Id)
|
||||
.ToArray();
|
||||
|
||||
foreach (var historyEvent in sortedEvents)
|
||||
{
|
||||
switch (historyEvent.EventType)
|
||||
{
|
||||
case HistoryEventType.IndexerRss:
|
||||
case HistoryEventType.IndexerQuery:
|
||||
indexerStats.NumberOfQueries++;
|
||||
break;
|
||||
case HistoryEventType.ReleaseGrabbed:
|
||||
indexerStats.NumberOfGrabs++;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
hostStatsList.Add(indexerStats);
|
||||
}
|
||||
|
||||
return hostStatistics.ToList();
|
||||
return new CombinedStatistics
|
||||
{
|
||||
IndexerStatistics = indexerStatsList,
|
||||
UserAgentStatistics = userAgentStatsList,
|
||||
HostStatistics = hostStatsList
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in new issue