Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

Removed the "cc-catalog" references from the system-architecure diagram. #771

Merged
merged 4 commits into from
Jul 3, 2022
Merged

Removed the "cc-catalog" references from the system-architecure diagram. #771

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4be9bf9
Replaced the image
raghuvar-arora-au2 Jun 24, 2022
7a339b6
made the changes recommeded by zack
raghuvar-arora-au2 Jun 24, 2022
212efec
made the changes as suggested
raghuvar-arora-au2 Jun 25, 2022
25088bf
updated the diagram (again)
raghuvar-arora-au2 Jul 1, 2022
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Our API documentation can also be found at [https://api.openverse.engineering](h

## System architecture

![System architecture](readme_assets/system_architecture.png)
![System architecture](readme_assets/system_diagram/system_architecture.png)

### Basic flow of data

Expand Down
Binary file removed readme_assets/system_architecture.png
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions readme_assets/system_diagram/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
The diagram was made using [draw.io](https://app.diagrams.net/).

The [system_architecure.xml](system_architecture.xml) file will allow you to restore, and edit it on the above-mentioned platform.
Binary file added readme_assets/system_diagram/system_architecture.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
133 changes: 133 additions & 0 deletions readme_assets/system_diagram/system_architecture.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
<?xml version="1.0" encoding="UTF-8"?>
<mxfile host="app.diagrams.net" modified="2022-06-24T20:52:11.091Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36" etag="BpKNgWuwRr6-oT9PQJx4" version="20.0.3" type="google">
<diagram id="sl2x0e_TDbJIdWYE920b" name="Page-1">
<mxGraphModel dx="548" dy="696" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="0" pageScale="1" pageWidth="850" pageHeight="1100" background="#ffffff" math="0" shadow="0">
<root>
<mxCell id="0" />
<mxCell id="1" parent="0" />
<mxCell id="JVIGxF9oKAkimninJbSp-79" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;labelBackgroundColor=#F8CECC;startArrow=none;startFill=0;endArrow=classic;endFill=1;dashed=1;" edge="1" parent="1" source="JVIGxF9oKAkimninJbSp-4" target="JVIGxF9oKAkimninJbSp-77">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-4" value="Ingestion Server" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
<mxGeometry x="420" y="70" width="270" height="70" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-24" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;startArrow=classic;startFill=1;endArrow=classic;endFill=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="1" source="JVIGxF9oKAkimninJbSp-7" target="JVIGxF9oKAkimninJbSp-10">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-70" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;startArrow=none;startFill=0;endArrow=classic;endFill=1;" edge="1" parent="1" source="JVIGxF9oKAkimninJbSp-5" target="JVIGxF9oKAkimninJbSp-7">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-5" value="Upstream/Intermediary" style="strokeWidth=1;html=1;shape=mxgraph.flowchart.database;whiteSpace=wrap;fillColor=#f8cecc;strokeColor=#b85450;" vertex="1" parent="1">
<mxGeometry x="148" y="210" width="130" height="70" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-6" value="&lt;span style=&quot;background-color: rgb(248, 206, 204);&quot;&gt;Data Pipeline&lt;/span&gt;" style="shape=flexArrow;endArrow=classic;html=1;rounded=0;width=21;endSize=5.71;fillColor=#f8cecc;strokeColor=#b85450;" edge="1" parent="1">
<mxGeometry width="50" height="50" relative="1" as="geometry">
<mxPoint x="11" y="244.83" as="sourcePoint" />
<mxPoint x="141" y="244.33" as="targetPoint" />
<Array as="points">
<mxPoint x="121" y="244.33" />
</Array>
</mxGeometry>
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-22" style="rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;startArrow=none;startFill=0;" edge="1" parent="1" source="JVIGxF9oKAkimninJbSp-7" target="JVIGxF9oKAkimninJbSp-4">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-7" value="API Database" style="strokeWidth=1;html=1;shape=mxgraph.flowchart.database;whiteSpace=wrap;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
<mxGeometry x="350" y="210" width="130" height="70" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-23" style="edgeStyle=none;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;startArrow=classic;startFill=1;endArrow=none;endFill=0;" edge="1" parent="1" source="JVIGxF9oKAkimninJbSp-9" target="JVIGxF9oKAkimninJbSp-4">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-9" value="ElasticSearch" style="strokeWidth=1;html=1;shape=mxgraph.flowchart.database;whiteSpace=wrap;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
<mxGeometry x="690" y="210" width="130" height="70" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;entryPerimeter=0;startArrow=classic;startFill=1;endArrow=none;endFill=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="1" source="JVIGxF9oKAkimninJbSp-10" target="JVIGxF9oKAkimninJbSp-9">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-10" value="API Server Group&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;&lt;br&gt;" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
<mxGeometry x="435" y="430" width="300" height="130" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-12" value="Catalog-api" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
<mxGeometry x="455" y="480" width="80" height="40" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-13" value="Catalog-api" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
<mxGeometry x="545" y="480" width="80" height="40" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-14" value="Catalog-api" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
<mxGeometry x="635" y="480" width="80" height="40" as="geometry" />
</mxCell>
sarayourfriend marked this conversation as resolved.
Show resolved Hide resolved
<mxCell id="JVIGxF9oKAkimninJbSp-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;startArrow=classic;startFill=1;" edge="1" parent="1" source="JVIGxF9oKAkimninJbSp-15" target="JVIGxF9oKAkimninJbSp-10">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-72" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;labelBackgroundColor=#F8CECC;startArrow=none;startFill=0;endArrow=classic;endFill=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="1" source="JVIGxF9oKAkimninJbSp-15" target="JVIGxF9oKAkimninJbSp-71">
<mxGeometry relative="1" as="geometry">
<mxPoint x="381.7391357421875" y="610" as="targetPoint" />
</mxGeometry>
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-15" value="Load Balancer" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
<mxGeometry x="525" y="590" width="120" height="40" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-16" value="frontend" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fillColor=#f8cecc;strokeColor=#b85450;" vertex="1" parent="1">
<mxGeometry x="525" y="700" width="120" height="40" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;startArrow=classic;startFill=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="JVIGxF9oKAkimninJbSp-16" target="JVIGxF9oKAkimninJbSp-15">
<mxGeometry relative="1" as="geometry">
<mxPoint x="584.5" y="700" as="sourcePoint" />
<mxPoint x="585" y="660" as="targetPoint" />
</mxGeometry>
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-26" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;endArrow=classic;endFill=1;" edge="1" parent="1" source="JVIGxF9oKAkimninJbSp-21" target="JVIGxF9oKAkimninJbSp-10">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-21" value="Redis" style="strokeWidth=1;html=1;shape=mxgraph.flowchart.database;whiteSpace=wrap;fillColor=#dae8fc;strokeColor=#6c8ebf;" vertex="1" parent="1">
<mxGeometry x="520" y="250" width="130" height="70" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-58" value="-Search queries&lt;br&gt;-Tag Stats&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp;&amp;nbsp;" style="text;html=1;align=left;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
<mxGeometry x="770" y="350" width="110" height="40" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-59" value="-Site cache&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp;&amp;nbsp;&lt;br&gt;-Traffic stats&amp;nbsp; &amp;nbsp; &amp;nbsp;&amp;nbsp;&lt;br&gt;-Dead link cache" style="text;html=1;align=left;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We no longer hold traffic stats anywhere as far as I am aware, so I think we can remove that bit.

Suggested change
<mxCell id="JVIGxF9oKAkimninJbSp-59" value="-Site cache&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp;&amp;nbsp;&lt;br&gt;-Traffic stats&amp;nbsp; &amp;nbsp; &amp;nbsp;&amp;nbsp;&lt;br&gt;-Dead link cache" style="text;html=1;align=left;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
<mxCell id="JVIGxF9oKAkimninJbSp-59" value="-Site cache&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp;&amp;nbsp;&lt;br&gt;-Dead link cache" style="text;html=1;align=left;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">

<mxGeometry x="590" y="350" width="110" height="60" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-60" value="-Detail views&lt;br&gt;-Lists&amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp; &amp;nbsp;&lt;br&gt;-Content provider data&lt;br&gt;&lt;div style=&quot;&quot;&gt;&lt;span style=&quot;background-color: initial;&quot;&gt;-Link shortening data&lt;/span&gt;&lt;/div&gt;" style="text;html=1;align=left;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
<mxGeometry x="285" y="360" width="140" height="70" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-61" value="Legend" style="align=center;fontSize=16;fontStyle=1;strokeColor=none;fillColor=none;fontColor=#4D4D4D;spacingTop=-8;resizable=0;" vertex="1" parent="1">
<mxGeometry x="28" y="37" width="180" height="30" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-62" value="" style="shape=table;html=1;whiteSpace=wrap;startSize=0;container=1;collapsible=0;childLayout=tableLayout;fillColor=none;align=left;spacingLeft=10;strokeColor=none;rounded=1;arcSize=11;fontColor=#FFFFFF;resizable=0;points=[[0.25,0,0],[0.5,0,0],[0.75,0,0],[1,0.25,0],[1,0.5,0],[1,0.75,0],[0.75,1,0],[0.5,1,0],[0.25,1,0],[0,0.75,0],[0,0.5,0],[0,0.25,0]];" vertex="1" parent="1">
<mxGeometry x="28" y="67" width="180" height="90" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-63" value="EC2&amp;nbsp; Instances" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;fillColor=#ffe6cc;top=0;left=0;bottom=0;right=0;overflow=hidden;pointerEvents=1;align=left;spacingLeft=10;strokeColor=#d79b00;" vertex="1" parent="JVIGxF9oKAkimninJbSp-62">
<mxGeometry width="180" height="30" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-64" value="Other infrastructure" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;fillColor=#dae8fc;top=0;left=0;bottom=0;right=0;overflow=hidden;pointerEvents=1;align=left;spacingLeft=10;strokeWidth=1;strokeColor=#6c8ebf;" vertex="1" parent="JVIGxF9oKAkimninJbSp-62">
<mxGeometry y="30" width="180" height="30" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-65" value="External dependancy" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;fillColor=#f8cecc;top=0;left=0;bottom=0;right=0;overflow=hidden;pointerEvents=1;align=left;spacingLeft=10;strokeWidth=1;strokeColor=#b85450;" vertex="1" parent="JVIGxF9oKAkimninJbSp-62">
<mxGeometry y="60" width="180" height="30" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-76" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;labelBackgroundColor=#F8CECC;startArrow=none;startFill=0;endArrow=classic;endFill=1;" edge="1" parent="1" source="JVIGxF9oKAkimninJbSp-71" target="JVIGxF9oKAkimninJbSp-75">
<mxGeometry relative="1" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-71" value="Proxy" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fillColor=#ffe6cc;strokeColor=#d79b00;" vertex="1" parent="1">
<mxGeometry x="127" y="590" width="112" height="40" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-73" value="proxy to api.openverse.engineering/**" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
<mxGeometry x="280" y="581" width="218" height="26" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-74" value="Reindex" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
<mxGeometry x="614" y="151" width="62" height="26" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-75" value="shares.cc/**" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fillColor=#f8cecc;strokeColor=#b85450;" vertex="1" parent="1">
<mxGeometry x="123" y="700" width="120" height="40" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-77" value="Ingest" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
<mxGeometry x="286" y="217" width="51" height="26" as="geometry" />
</mxCell>
<mxCell id="JVIGxF9oKAkimninJbSp-78" value="Image&lt;br&gt;metadata" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];autosize=1;strokeColor=none;fillColor=none;" vertex="1" parent="1">
<mxGeometry x="280" y="239" width="68" height="41" as="geometry" />
</mxCell>
</root>
</mxGraphModel>
</diagram>
</mxfile>